Merge "[SDNGC-5859] copy local change to onap"
authorDan Timoney <dtimoney@att.com>
Fri, 23 Jun 2017 13:29:11 +0000 (13:29 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 23 Jun 2017 13:29:11 +0000 (13:29 +0000)
Former-commit-id: 5f6ab6cbef76e507941e2ae2b886ec2a29dfb5ab


Trivial merge