Merge "Rework config"
authorEddy Hautot <eh552t@intl.att.com>
Wed, 7 Mar 2018 12:36:42 +0000 (12:36 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 7 Mar 2018 12:36:42 +0000 (12:36 +0000)

Trivial merge