Merge "fix inputs, template expander, add tests"
authorLusheng Ji <lji@research.att.com>
Wed, 11 Oct 2017 21:55:34 +0000 (21:55 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 11 Oct 2017 21:55:34 +0000 (21:55 +0000)

Trivial merge