(cherry picked from commit ce0462129fe09898fd9b169cae0564cb6d9bc419) (cherry picked from commit 9855e884cbf56715ed88d1fe943f0baf8fe1637f)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1134994 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/HADOOP-4687/core@776175 13f79535-47bb-0310-9956-ffa450edef68