On the javahl-1.7-extensions branch:
Sync JavaHL changes from trunk up to r1494655.


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