Work around DB migration problems.
Merge branch 'odl_ml2' of github.com:CiscoSystems/neutron into odl_ml2

Conflicts:
	neutron/db/migration/alembic_migrations/versions/1fcfc149aca4_agents_unique_by_type_and_host.py