Merge "Fix Blocker/Critical sonar issues"
authorTian Lee <TianL@amdocs.com>
Thu, 21 Sep 2017 11:33:58 +0000 (11:33 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 21 Sep 2017 11:33:58 +0000 (11:33 +0000)

Trivial merge