Merge "fixed sonar issues and formatted code"
authorDan Timoney <dtimoney@att.com>
Wed, 19 Dec 2018 17:45:48 +0000 (17:45 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 19 Dec 2018 17:45:48 +0000 (17:45 +0000)

Trivial merge