merge MAPREDUCE-3872 from trunk. Fix an event handling races in ContainerLauncherImpl. Contributed by Robert Kanter.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459548 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4620. Documentation for dfs.namenode.rpc-address specifies wrong format. Contributed by Sandy Ryza.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459550 13f79535-47bb-0310-9956-ffa450edef68
merge -c r1459555 from trunk to branch-2 for YARN-417. Create AMRMClient wrapper that provides asynchronous callbacks. (Sandy Ryza via bikas)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459557 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1459573 from trunk for HDFS-4607.  In TestGetConf.testGetSpecificKey(), use a platform-specific line separator; otherwise, it fails on Windows.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459574 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1459576 from trunk for HDFS-4609. TestAuditLogs should release log handles between tests. 


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459577 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1459586 from trunk for HDFS-4615. Fix TestDFSShell failures on Windows.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459588 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1459592 from trunk for HDFS-4584. Skip TestNNWithQJM.testNewNamenodeTakesOverWriter() on Windows.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459593 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'branch-2' of https://github.com/griddynamics/yhadoop-common into branch-2-gd

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/launcher/ContainerLauncherImpl.java
Merge remote branch 'origin/branch-2-gd' into fb-YAHOO-260-branch-2-gd