HADOOP-8608. Add Configuration API for parsing time durations.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1477869 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5145. Changed default max-attempts to be more than one for MR jobs inline with YARN. Contributed by Zhijie Shen.


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