Merge 0.23-PB.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB-merge2@1294017 13f79535-47bb-0310-9956-ffa450edef68