Merge "Fix Some Bugs"
authortang peng <tang.peng5@zte.com.cn>
Thu, 9 Nov 2017 15:43:17 +0000 (15:43 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 9 Nov 2017 15:43:17 +0000 (15:43 +0000)

Trivial merge