Merge "[SDC-235] rebase code"
authorMichael Lando <ml636r@att.com>
Tue, 15 Aug 2017 13:43:25 +0000 (13:43 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 15 Aug 2017 13:43:25 +0000 (13:43 +0000)

Trivial merge