Merge "Forbid regular users to reset admin-only attrs to default values"

diff --cc neutron/policy.py
index 092750add59f6e597b131b9179d67bea795a5f6c,b7f7873e19122228f5fbd9819ec87f0c504db584..4a521617ebc95771cfc44ef53d699355b8f8c96c
--- 1/neutron/policy.py
--- 2/neutron/policy.py
+++ b/neutron/policy.py
@@@ -16,8 -16,9 +16,10 @@@
  """
  Policy engine for neutron.  Largely copied from nova.
  """
+ 
+ import collections
  import itertools
 +import logging
  import re
  
  from oslo.config import cfg

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

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