YARN-523. Modified a test-case to validate container diagnostics on localization failures. Contributed by Jian He.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1503532 13f79535-47bb-0310-9956-ffa450edef68
Trivial fix for minor refactor error for YARN-521

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