Merge "Fix Java related issues"
authorVratko Polák <vrpolak@cisco.com>
Fri, 15 Apr 2016 16:12:37 +0000 (16:12 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 15 Apr 2016 16:12:37 +0000 (16:12 +0000)

Trivial merge