Merge "Renamed template options and reordered"
authorDan Timoney <dtimoney@att.com>
Thu, 18 Jul 2019 13:31:27 +0000 (13:31 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 18 Jul 2019 13:31:27 +0000 (13:31 +0000)

Trivial merge