9c790a8fb7
svn merge --ignore-ancestry -c 1505847 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505848 13f79535-47bb-0310-9956-ffa450edef68