YARN-2912 Jersey Tests failing with port in use. (varun saxena via stevel)
HDFS-7517. Remove redundant non-null checks in FSNamesystem#getBlockLocations. Contributed by Haohui Mai.
HDFS-7514. TestTextCommand fails on Windows. (Arpit Agarwal)
HDFS-7059. Avoid resolving path multiple times. Contributed by Jing Zhao.
HADOOP-11238. Update the NameNode's Group Cache in the background when possible (Chris Li via Colin P. McCabe)
(cherry picked from commit e5a692519956aefb3a540ed0137b63cf598ac10d)
HDFS-7426. Change nntop JMX format to be a JSON blob.

(cherry picked from commit fa7b9248e415c04bb555772f44fadaf8d9f34974)
YARN-2950. Change message to mandate, not suggest JS requirement on UI. Contributed by Dustin Cote.

(cherry picked from commit 0e37bbc8e3f8e96acd96522face2f4bb01584cb4)
HADOOP-11394. hadoop-aws documentation missing. Contributed by Chris Nauroth.

(cherry picked from commit 9458cd5bce20358e31c0cfb594bc545c7824b10d)
HADOOP-11396. Provide navigation in the site documentation linking to the Hadoop Compatible File Systems. Contributed by Chris Nauroth.

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