Merge "Fix failed tests"
authorJames Forsyth <jf2512@att.com>
Fri, 7 Sep 2018 17:32:30 +0000 (17:32 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 7 Sep 2018 17:32:30 +0000 (17:32 +0000)

Trivial merge