HDFS-7340. Make rollingUpgrade start/finalize idempotent. Contributed by Jing Zhao.
HADOOP-11165. TestUTF8 fails when run against java 8. Contributed by Stephen Chu.

(cherry picked from commit 85da71c2d3c565a8920e47fe3925e8e0bef353a5)
HADOOP-10847. Remove the usage of sun.security.x509.* in testing code. Contributed by Pascal Oliva.
HDFS-7334. Fix periodic failures of TestCheckpoint#testTooManyEditReplayFailures. Contributed by Charles Lamb.
HADOOP-10563. Remove the dependency of jsp in trunk. Contributed by Haohui Mai.
Addendum patch for HADOOP-10563 in branch-2.
HADOOP-10717. HttpServer2 should load jsp DTD from local jars instead of going remote. Contributed by Dapeng Sun.
HDFS-7356. Use DirectoryListing.hasMore() directly in nfs. Contributed by Li Lu.
HDFS-7355. TestDataNodeVolumeFailure#testUnderReplicationAfterVolFailure fails on Windows, because we cannot deny access to the file owner. Contributed by Chris Nauroth.
YARN-2752. Made ContainerExecutor append "nice -n" arg only when priority adjustment flag is set. Contributed by Xuan Gong.
HDFS-7233. NN logs unnecessary org.apache.hadoop.hdfs.protocol.UnresolvedPathException. Contributed by Rushabh S Shah.
HADOOP-11260. Patch up Jetty to disable SSLv3. (Mike Yoder via kasha)

(cherry picked from commit dbf30e3c0e1522e6588aecac71c990c0b01fd8fb)
Adding release 2.5.2 to CHANGES.txt

(cherry picked from commit 4de56d27fbed566f143b286aa74b16ef94260190)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
HADOOP-11268. Update BUILDING.txt to remove the workaround for tools.jar. Contributed by Li Lu.
YARN-2010. Handle app-recovery failures gracefully. (Jian He and Karthik Kambatla via kasha)

(cherry picked from commit b2cd2698028118b6384904732dbf94942f644732)
HADOOP-11230. Add missing dependency of bouncycastle for kms, httpfs, hdfs, MR and YARN. Contributed by Robert Kanter.
HADOOP-11269. Add java 8 profile for hadoop-annotations. Contributed by Li Lu.
YARN-2804. Fixed Timeline service to not fill the logs with JAXB bindings exceptions. Contributed by Zhijie Shen.

(cherry picked from commit b76179895dd2ef4d56e8de31e9f673375faa2afa)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
HDFS-7357. FSNamesystem.checkFileProgress should log file path. Contributed by Tsz Wo Nicholas Sze.
MAPREDUCE-6048. Fixed TestJavaSerialization failure. Contributed by Varun Vasudev
(cherry picked from commit 73068f677bc45029743ba2e0b3c0256a8069c13e)