Merge "Checkstyle fixes (to be enforced)"
authorSam Hague <shague@redhat.com>
Sat, 23 Jul 2016 19:26:23 +0000 (19:26 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Sat, 23 Jul 2016 19:26:23 +0000 (19:26 +0000)

Trivial merge