Merge changes I64225953,If4fc0644
authorRam Koya <rk541m@att.com>
Tue, 28 Aug 2018 13:01:00 +0000 (13:01 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 28 Aug 2018 13:01:00 +0000 (13:01 +0000)
* changes:
  Sonar Major issues
  Sonar Major issues


Trivial merge