Merge "Fixed the critical issues sonar encountered"
authorSteven Blimkie <Steven.Blimkie@amdocs.com>
Fri, 13 Oct 2017 20:23:14 +0000 (20:23 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 13 Oct 2017 20:23:14 +0000 (20:23 +0000)

Trivial merge