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

Trivial merge