Merge changes from topic "K-1"
authorJonathan Gathman <jonathan.gathman@att.com>
Tue, 17 Sep 2019 08:11:44 +0000 (08:11 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 17 Sep 2019 08:11:44 +0000 (08:11 +0000)
* changes:
  Merge this if statement with the enclosing one
  Remove useless curly braces around statement
  Merge this if statement with the enclosing one.


Trivial merge