Merge "Re-commit some changes which were lost"
authorSteve Smokowski <ss835w@att.com>
Wed, 10 Apr 2019 17:38:18 +0000 (17:38 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 10 Apr 2019 17:38:18 +0000 (17:38 +0000)

Trivial merge