Merge "Fix from robot testing and resolve merge"
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>
Thu, 6 Sep 2018 21:18:28 +0000 (21:18 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 6 Sep 2018 21:18:28 +0000 (21:18 +0000)

Trivial merge