Merge "[SDC] code sync"
authorMichael Lando <ml636r@att.com>
Mon, 7 Aug 2017 10:19:02 +0000 (10:19 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 7 Aug 2017 10:19:02 +0000 (10:19 +0000)

Trivial merge