ensure that there is an active database proposal before saving/committing
Merge pull request #146 from dirkmueller/release/roxy/master

Sync authentication methods with Upstream keystone
Merge pull request #136 from mapleoin/validate_database

ensure that there is an active database proposal before saving/committing
Fix typo in comment line
Merge pull request #147 from vuntz/typo

Fix typo in comment line
Revert "remove deprecated option token_format"

This reverts commit 3d872f6739ea2973cf1928e4b9c09a926c298155.
Revert "commenting deprecated parameter token_format"

This reverts commit f31fb0e622e610a73ec02c10a5b41d28d1b9f2bd.
Merge pull request #148 from vuntz/revert-token_signing

Revert commits breaking the choice of token format
Make 001_ldap_user_enabled_default_str_to_bool.rb more solid

We can really convert the value, so let's do it.
Improve barclamp description
Merge pull request #149 from vuntz/fix-migration-script

Make 001_ldap_user_enabled_default_str_to_bool.rb more solid
Merge pull request #150 from vuntz/improve-description

Improve barclamp description
using tenant name, user name and password for creating ec2