HDFS-7283. Bump DataNode OOM log from WARN to ERROR. Contributed by Stephen Chu.
YARN-2724. Skipped uploading a local log file to HDFS if exception is raised when opening it. Contributed by Xuan Gong.

(cherry picked from commit e31f0a6558b106662c83e1f797216e412b6689a9)
HDFS-6904. YARN unable to renew delegation token fetched via webhdfs due to incorrect service port.
HDFS-6904. Added files missing in previous commit.
HADOOP-11228. Winutils task: unsecure path should not call AddNodeManagerAndUserACEsToObject. Contributed by Remus Rusanu
(cherry picked from commit f7e89bb349d4512b47f94b545e3f489a85e851f0)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
HDFS-6988. Improve HDFS-6581 eviction configuration (Xiaoyu Yao via Colin P. McCabe)
(cherry picked from commit a52eb4bc5fb21574859f779001ea9d95bf5207fe)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
YARN-2703. Added logUploadedTime into LogValue for better display. Contributed by Xuan Gong.

(cherry picked from commit f81dc3f995579c1b94b11d60e9fc6da56c8a9496)
YARN-2713. "RM Home" link in NM should point to one of the RMs in an HA setup. (kasha)

(cherry picked from commit 683897fd028dcc2185383f73b52d15245a69e0cb)
YARN-1915. Fixed a race condition that client could use the ClientToAMToken to contact with AM before AM actually receives the ClientToAMTokenMasterKey. Contributed by Jason Lowe
(cherry picked from commit 5864dd99a419b8a0fb973a4984c0f1d1e02ccf16)
YARN-2314. Disable ContainerManagementProtocolProxy cache by default to prevent creating thousands of threads in a large cluster. Contributed by Jason Lowe
(cherry picked from commit f44cf99599119b5e989be724eeab447b2dc4fe53)
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2