On the javahl-1.7-extensions branch: Synced JavaHL with trunk up to r1520245.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/javahl-1.7-extensions@1520549 13f79535-47bb-0310-9956-ffa450edef68