Merge "Bump missing template names to ocata"
authorJenkins <jenkins@review.openstack.org>
Wed, 18 Jan 2017 10:21:18 +0000 (10:21 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 18 Jan 2017 10:21:18 +0000 (10:21 +0000)

Trivial merge