Change imports to reflect oslo changes.
Change imports to reflect oslo changes.
Merge branch 'havana' of github.com:rcbops-cookbooks/keystone into havana
Merge remote-tracking branch 'origin/master' into havana
version bump and service provider update
Added additional service types

Added Heat service type "orchestration" and "cloudformation"
which provide for the heat api for both the engine and cfn.
Use package_options on installation/upgrade
Merge branch 'havana' of github.com:rcbops-cookbooks/keystone into havana
Merge branch 'havana' of github.com:rcbops-cookbooks/keystone

Conflicts:
	metadata.rb