Merge "Fix the tests"
authorEddy Hautot <eh552t@intl.att.com>
Thu, 1 Mar 2018 14:24:25 +0000 (14:24 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 1 Mar 2018 14:24:25 +0000 (14:24 +0000)

Trivial merge