Merge -c r1469059 from trunk to branch-2 for YARN-514. Delayed store operations should not result in RM unavailability for app submission (Zhijie Shen via bikas)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469062 13f79535-47bb-0310-9956-ffa450edef68
Merge -c r1469060 from trunk to branch-2 for MAPREDUCE-5140. MR part of YARN-514 (Zhijie Shen via bikas)

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