Merge branch 'volume-keystone' into dt-test
Merge branch 'identity-ec2' into dt-test
Merge branch 'identity-catalog' into dt-test