Merge "Sonar Blocker"
authorPamela Dragosh <pdragosh@research.att.com>
Mon, 11 Sep 2017 16:15:18 +0000 (16:15 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 11 Sep 2017 16:15:18 +0000 (16:15 +0000)

Trivial merge