Merge "Fix for sonar critical issues."
authorDan Timoney <dt5972@att.com>
Tue, 11 Sep 2018 20:54:56 +0000 (20:54 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 11 Sep 2018 20:54:56 +0000 (20:54 +0000)

Trivial merge