Merge "Sonar:Major"
authorTony Hansen <tony@att.com>
Wed, 7 Feb 2018 15:32:41 +0000 (15:32 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 7 Feb 2018 15:32:41 +0000 (15:32 +0000)

Trivial merge