Merge "Rename some variables"
authorGary Wu <gary.i.wu@huawei.com>
Wed, 28 Feb 2018 16:39:48 +0000 (16:39 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 28 Feb 2018 16:39:48 +0000 (16:39 +0000)

Trivial merge