On the 'java10-compat' branch: Catch up with trunk @1841178

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/java10-compat@1841179 13f79535-47bb-0310-9956-ffa450edef68