Merge pull request #8818 from mshabunin:java-cleanup-fix
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Mon, 29 May 2017 14:53:19 +0000 (14:53 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Mon, 29 May 2017 14:53:19 +0000 (14:53 +0000)

Trivial merge