Align java soucre with 10.1.x/11.0.x
5 files changed