Merge "Fix issues related to checkstyle compliance"
authorBrady Johnson <brady.allen.johnson@ericsson.com>
Fri, 10 Feb 2017 11:30:18 +0000 (11:30 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 10 Feb 2017 11:30:18 +0000 (11:30 +0000)

Trivial merge