svn merge -c -1558337 . for reverting YARN-1603, which only partly committed.

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