Change-Id: I76aec68cbfb42d239279d7245a03290d691e87a4 (cherry picked from commit d3b1c6319546706c41a2011ead6c3fe208883200)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523587 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370666 13f79535-47bb-0310-9956-ffa450edef68