Merge "Add deployed-server backwards compatible template"
authorJenkins <jenkins@review.openstack.org>
Mon, 16 Jan 2017 10:06:43 +0000 (10:06 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 16 Jan 2017 10:06:43 +0000 (10:06 +0000)

Trivial merge