Merge r1537147,1537190,1537193 from trunk excluding the config-test.c changes

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1537147@1537216 13f79535-47bb-0310-9956-ffa450edef68