Merge "Rework configuration"
authorEddy Hautot <eh552t@intl.att.com>
Mon, 5 Mar 2018 12:53:44 +0000 (12:53 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 5 Mar 2018 12:53:44 +0000 (12:53 +0000)

Trivial merge