Merge "Fix Sonar Issues"
authorDan Timoney <dtimoney@att.com>
Mon, 11 Sep 2017 20:15:25 +0000 (20:15 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 11 Sep 2017 20:15:25 +0000 (20:15 +0000)

Trivial merge