Merge "Change autogenerate to be unconditional"

diff --cc neutron/db/migration/alembic_migrations/env.py
index 98c2678ea16cba50a07a1220e454c7e140bc20a6,46981e02e3142f3846fe027547fa5cdba27d6d6b..9866068b353d59801cd873ab598a6bd6c677eb76
--- 1/neutron/db/migration/alembic_migrations/env.py
--- 2/neutron/db/migration/alembic_migrations/env.py
+++ b/neutron/db/migration/alembic_migrations/env.py
@@@ -18,12 -18,11 +18,12 @@@ from logging import config as logging_c
  
  from alembic import context
  from oslo.config import cfg
 +from oslo.db.sqlalchemy import session
  import sqlalchemy as sa
 -from sqlalchemy import create_engine, event, pool
 +from sqlalchemy import event
  
+ from neutron.db.migration.models import head  # noqa
  from neutron.db import model_base
- from neutron.openstack.common import importutils
  
  
  MYSQL_ENGINE = None