Merge branch 'stable/havana' of https://github.com/openstack/neutron into cis-havana-staging

Conflicts:
	neutron/extensions/securitygroup.py
	neutron/tests/unit/test_linux_dhcp.py