Merge "Remove get_admin_roles and associated logic"

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

diff --cc neutron/tests/unit/extensions/test_l3.py
Simple merge

diff --cc requirements.txt
Simple merge