Merge "update code"
authorMichael Lando <ml636r@att.com>
Thu, 14 Sep 2017 03:00:19 +0000 (03:00 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 14 Sep 2017 03:00:19 +0000 (03:00 +0000)

Trivial merge