YARN-1481. Reverting addendum patch

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1553994 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch: upstream/trunk