Merge "VES5.0 development changes not for test"
authorMarco Platania <platania@research.att.com>
Thu, 18 May 2017 15:02:10 +0000 (15:02 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 18 May 2017 15:02:10 +0000 (15:02 +0000)

Trivial merge