Merge from trunk r30215, r30221, r30225, r30226,and r30230.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r30215@870310 13f79535-47bb-0310-9956-ffa450edef68
10 files changed