Merge "CCSDK-464"
authorDan Timoney <dt5972@att.com>
Mon, 24 Sep 2018 13:18:08 +0000 (13:18 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 24 Sep 2018 13:18:08 +0000 (13:18 +0000)
Former-commit-id: f9d589c3b3cd9974edfeee2dbaebd256c7634db1


Trivial merge