Merge pull request #8074 from alalek:fix_java_tests
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 26 Jan 2017 08:56:21 +0000 (08:56 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 26 Jan 2017 08:56:22 +0000 (08:56 +0000)

Trivial merge