Merge "shared policy shouldn't have unshared rules"

diff --cc neutron/db/firewall/firewall_db.py
Simple merge

diff --cc neutron/extensions/firewall.py
Simple merge

diff --cc neutron/tests/unit/db/firewall/test_db_firewall.py
Simple merge