admin context changes

Change-Id: Ia342fdbd081d78bf0c52d08be46e9df27fe905e1
Merge branch 'csr1kv_for_routing_icehouse' of github.com:CiscoSystems/neutron into csr1kv_for_routing_icehouse