Merge "Fix template generation for R2"
authorYan Yang <yangyanyj@chinamobile.com>
Fri, 1 Jun 2018 05:34:57 +0000 (05:34 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 1 Jun 2018 05:34:57 +0000 (05:34 +0000)

Trivial merge