Merge "Sync up the changes between ecomp and onap"
authorJames Forsyth <jf2512@att.com>
Thu, 6 Sep 2018 14:52:47 +0000 (14:52 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 6 Sep 2018 14:52:47 +0000 (14:52 +0000)

Trivial merge