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