[Java]: Change line wrapping style to better suit rename refactorings.
Merge remote-tracking branch 'origin/master'