Merge "Fix some minor issues in codebase"
authorBin Yang <bin.yang@windriver.com>
Wed, 25 Apr 2018 00:11:11 +0000 (00:11 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 25 Apr 2018 00:11:11 +0000 (00:11 +0000)

Trivial merge