Merge "Fix CP handling"
authorYan Yang <yangyanyj@chinamobile.com>
Mon, 5 Mar 2018 01:04:52 +0000 (01:04 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 5 Mar 2018 01:04:52 +0000 (01:04 +0000)

Trivial merge