Merge "Consistent hostname format env for split-stack"
authorJenkins <jenkins@review.openstack.org>
Fri, 28 Jul 2017 02:57:20 +0000 (02:57 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 28 Jul 2017 02:57:20 +0000 (02:57 +0000)

Trivial merge