HADOOP-9932. Improper synchronization in RetryCache. Contributed by Kihwal Lee.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1520126 13f79535-47bb-0310-9956-ffa450edef68
YARN-1065. NM should provide AuxillaryService data to the container (Xuan Gong via bikas)

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