Revert "Back off initial migration to 34"

This reverts commit 84e0218701a9a52ba771d58e91e486ae9d0b8ea0.
Revert "Back off initial migration to 35"

This reverts commit 48e508f0c56119411f9894b6d352937d6eecca91.
Revert "Collapse SQL Migrations"

This reverts commit 87d0e0fb3731c45ed0ee0dea83297858addfbb7c.

Conflicts:

	keystone/common/sql/migrate_repo/versions/036_havana.py
	keystone/common/sql/migration_helpers.py
	keystone/tests/test_sql_upgrade.py
Revert "Create a default domain (bp default-domain)"

This reverts commit 5bc46d861e9c8f355d2bdd68912be3e64c2dc9e9.

Conflicts:

	etc/keystone.conf.sample
	keystone/common/sql/migrate_repo/versions/008_create_default_domain.py
	keystone/config.py
	keystone/identity/controllers.py
	tests/test_sql_upgrade.py