Merge "Fix Blocker/Critical sonar issues"
authorTian Lee <TianL@amdocs.com>
Fri, 22 Sep 2017 14:51:32 +0000 (14:51 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 22 Sep 2017 14:51:32 +0000 (14:51 +0000)

Trivial merge