MAPREDUCE-5421. Fixed TestNonExistentJob failure after YARN-873. Contributed by Junping Du.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1507401 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5034.  Remove debug prints from GetFileLinkInfo (Andrew Wang via Colin Patrick McCabe)

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