Merge "Add the vnf changes"
authorJames Forsyth <jf2512@att.com>
Mon, 14 Aug 2017 16:53:48 +0000 (16:53 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 14 Aug 2017 16:53:48 +0000 (16:53 +0000)

Trivial merge