YARN-635 and MAPREDUCE-5301. Bug fix as the committed patch ended up being stale.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489287 13f79535-47bb-0310-9956-ffa450edef68