Merge "Don't have separate protocols/ports for Keystone v3"
authorJenkins <jenkins@review.openstack.org>
Mon, 11 Apr 2016 11:00:37 +0000 (11:00 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 11 Apr 2016 11:00:37 +0000 (11:00 +0000)

Trivial merge