Merge "Return 403 instead of 404 on attr policy failures"

diff --cc neutron/tests/unit/services/firewall/test_fwaas_plugin.py
Simple merge

diff --cc neutron/tests/unit/test_db_plugin.py
Simple merge