YARN-378. Fix RM to make the AM max attempts/retries to be configurable per application by clients. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1460895 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460897 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5062. Fix MR AM to read max-retries from the RM. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1460923 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460924 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/branch-2' into branch-2-gd
Merge remote branch 'origin/branch-2-gd' into fb-YAHOO-242-branch-2-gd