Sync authentication methods with Upstream keystone

Otherwise barclamp keystone proposal fails with CVE-2013-6391 fixed.
Merge pull request #146 from dirkmueller/release/roxy/master

Sync authentication methods with Upstream keystone