Merge "fix cp related error"
authorFu Jinhua <fu.jinhua@zte.com.cn>
Mon, 1 Apr 2019 11:48:01 +0000 (11:48 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 1 Apr 2019 11:48:01 +0000 (11:48 +0000)

Trivial merge