Merge "Local and Class variable name conflict resolved"
authorJorge Hernandez <jh1730@att.com>
Mon, 15 Jan 2018 23:36:03 +0000 (23:36 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 15 Jan 2018 23:36:03 +0000 (23:36 +0000)

Trivial merge