Merge "openstack-heat-templates: fix deprecation path"
authorJenkins <jenkins@review.openstack.org>
Fri, 11 Aug 2017 17:55:43 +0000 (17:55 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 11 Aug 2017 17:55:43 +0000 (17:55 +0000)

Trivial merge