Merge "Update Copyright and Licensing markings"
authorGregory Glover <gg2147@att.com>
Wed, 18 Oct 2017 20:05:23 +0000 (20:05 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 18 Oct 2017 20:05:23 +0000 (20:05 +0000)

Trivial merge