(cherry picked from commit c559df2219f4049f2412fba8ad031c434d9e82b6)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527065 13f79535-47bb-0310-9956-ffa450edef68