Merge "Fixes for sonar critical issues"
authorJorge Hernandez <jh1730@att.com>
Wed, 23 Aug 2017 19:35:20 +0000 (19:35 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 23 Aug 2017 19:35:20 +0000 (19:35 +0000)

Trivial merge