Merge "Fix endpoint names"
authorJenkins <jenkins@review.openstack.org>
Wed, 10 Feb 2016 21:42:07 +0000 (21:42 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 10 Feb 2016 21:42:07 +0000 (21:42 +0000)

Trivial merge