allow metering endpoints
Merge pull request #92 from rpedde-rcbops/allow-metering

Merged automatically by jenkins after successful build test
Merge pull request #97 from jcannava/ldap

Merged automatically by jenkins after successful build test
Merge branch 'master' of https://github.com/rcbops-cookbooks/keystone into ldap