Merge "Fixed as per Java Code Conventions"
authorDan Timoney <dtimoney@att.com>
Thu, 4 Jan 2018 12:28:37 +0000 (12:28 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 4 Jan 2018 12:28:37 +0000 (12:28 +0000)

Trivial merge