HDFS-6606. Optimize HDFS Encrypted Transport performance. (yliu)
YARN-2760. Remove 'experimental' from FairScheduler docs. (Harsh J via kasha)

(cherry picked from commit ade3727ecb092935dcc0f1291c1e6cf43d764a03)
YARN-2279. Add UTs to cover timeline server authentication. Contributed by Zhijie Shen
HDFS-6663. Admin command to track file and locations from block id.
Contributed by Chen He.
(cherry picked from commit 371a3b87ed346732ed58a4faab0c6c1db57c86ed)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java
HDFS-7213. processIncrementalBlockReport performance degradation.
Contributed by Eric Payne.
(cherry picked from commit e226b5b40d716b6d363c43a8783766b72734e347)
YARN-2758. Update TestApplicationHistoryClientService to use the new generic history store. Contributed by Zhijie Shen
YARN-2741. Made NM web UI serve logs on the drive other than C: on Windows. Contributed by Craig Welch.

(cherry picked from commit 8984e9b1774033e379b57da1bd30a5c81888c7a3)
HDFS-7291. Persist in-memory replicas with appropriate unbuffered copy API on POSIX and Windows. Contributed by Xiaoyu Yao.

(cherry picked from commit c6f04f391b54e57467b3ae5d0a95bd96e7feaa82)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
HDFS-7301. TestMissingBlocksAlert should use MXBeans instead of old web UI. Contributed by Zhe Zhang.
HDFS-7235. DataNode#transferBlock should report blocks that don't exist using reportBadBlock (yzhang via cmccabe)
(cherry picked from commit ac9ab037e9a9b03e4fa9bd471d3ab9940beb53fb)
HDFS-7280. Use netty 4 in WebImageViewer. Contributed by Haohui Mai.
HADOOP-11217. Disable SSLv3 in KMS. (Robert Kanter via kasha)

(cherry picked from commit 1a780823384a9c4289b8bb0b3c73e6b886d78fd0)
HDFS-7274. Disable SSLv3 in HttpFS. (Robert Kanter via kasha)

(cherry picked from commit 3f48493bed22f9618a9330deaaaa070734989814)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
YARN-2503. Added node lablels in web UI. Contributed by Wangda Tan
(cherry picked from commit d5e0a09721a5156fa2ee51ac1c32fbfd9905b8fb)
HADOOP-11243. SSLFactory shouldn't allow SSLv3. (Wei Yan via kasha)

(cherry picked from commit 3c5f5af1184e85158dec962df0b0bc2be8d0d1e3)
YARN-2747. Fixed the test failure of TestAggregatedLogFormat when native I/O is enabled. Contributed by Xuan Gong.

(cherry picked from commit ec63a3ffbd9413e7434594682fdbbd36eef7413c)
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2