Merged revisions 22114-22704 via svnmerge from /svn/trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/ood-status-info@862780 13f79535-47bb-0310-9956-ffa450edef68