Merge "Support deprecated controllerExtraConfig naming in role template"
authorJenkins <jenkins@review.openstack.org>
Fri, 14 Jul 2017 17:10:17 +0000 (17:10 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 14 Jul 2017 17:10:17 +0000 (17:10 +0000)

Trivial merge