Merge "change order in class for java convention"
authorJames Forsyth <jf2512@att.com>
Tue, 10 Jul 2018 13:26:03 +0000 (13:26 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 10 Jul 2018 13:26:03 +0000 (13:26 +0000)

Trivial merge