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
Fixed an missing column issue on DB migraiton

This issue occured when migrating from branch 'savi-iam' to
'stable/juno'.

Reference: https://github.com/openstack/keystone/commit/02da3afe4df65b8c469ceb430ca34dab83d6451c
Fixed an DB migration issue from savi-iam to juno

Moved an fix from version 009 to 013, because migration 009
won't be executed when migrating from branch 'savi-iam' to
'stable/juno'. Please reference the following link for the details
of the fix.

https://github.com/openstack/keystone/commit/329b00d6dbd624f5554a9c5578b9f6a8070f3312
Cache the catalog based on tenant ID.

We added support for caching catalog to improve the performance.
This feature was added to 'savi-iam' branch before. This commit
ported this feature to 'stable/juno' branch. Basically, we did
the following modifications:
* Extended 'on_argument' decorator to support generating key
with specified argument (instead of all arguments) by using
'hint'.
* Added new decorator 'revoke' to invalidate a set of keys with
the same 'revocation_key' that was specified before.

Ported from commit:
https://github.com/savi-dev/keystone/commit/a07bba8fca32b79378092440f4ef645bea89d7e5

Depending on commits:
https://bitbucket.org/hongbin034/dogpile.cache/commits/d01a07701f6f683e8c727e54d59d2da206f7f0b4
https://bitbucket.org/hongbin034/dogpile.cache/commits/32506393344cfeedbc1ae238151da88f50f32186
Merge pull request #10 from hongbin/stable/juno

Stable/juno