Merge "Fixed as per Java Code Conventions"
authorJorge Hernandez <jh1730@att.com>
Mon, 15 Jan 2018 23:35:51 +0000 (23:35 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 15 Jan 2018 23:35:51 +0000 (23:35 +0000)

Trivial merge