YARN-542. Changed the default global AM max-attempts value to be not one. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1470094 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470095 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-259-branch-2-gd