MAPREDUCE-6142. Fixed test failures in TestJobHistoryEventHandler and TestMRTimelineEventHandling. Contributed by Zhijie Shen.

(cherry picked from commit 3f1441245db047b5b7289fe06c4c3306fe8189af)
YARN-2742. FairSchedulerConfiguration should allow extra spaces between value and unit. (Wei Yan via kasha)
(cherry picked from commit 782971ae7a0247bcf5920e10b434b7e0954dd868)
MAPREDUCE-6022. map_input_file is missing from streaming job
environment. Contributed by Jason Lowe.
(cherry picked from commit b056048114bf4701ef9dd22486db937cb589e81b)
HADOOP-11195. Move Id-Name mapping in NFS to the hadoop-common area for better maintenance. Contributed by Yongjun Zhang

(cherry picked from commit 72a556d3b0def0ab4e4509528cc513f6df06b084)
HADOOP-11068. Match hadoop.auth cookie format to jetty output. Contributed by Gregory Chanan.

(cherry picked from commit 5c900b522e70b512498ab7689f56eb1c5e4b963f)
HADOOP-11186: documentation should talk about hadoop.htrace.spanreceiver.classes, not hadoop.trace.spanreceiver.classes (cmccabe)
(cherry picked from commit c2575fb046bb8fab73ee9c55e0ce65d4d0df75d0)
YARN-2769. Fixed the problem that timeline domain is not set in distributed shell AM when using shell_command on Windows. Contributed by Varun Vasudev.

(cherry picked from commit 72496311def320987c31822776e8fbb73dfcc726)
HDFS-7287. The OfflineImageViewer (OIV) can output invalid XML depending on the filename (Ravi Prakash via Colin P. McCabe)
(cherry picked from commit d33e07dc49e00db138921fb3aa52c4ef00510161)
HADOOP-9740. Fix FsShell '-text' command to be able to read Avro files stored in HDFS and other filesystems. Contributed by Allan Yan
HDFS-7300.     HDFS-7300. The getMaxNodesPerRack() method in
BlockPlacementPolicyDefault is flawed. contributed by Kihwal Lee
(cherry picked from commit 3ae84e1ba8928879b3eda90e79667ba5a45d60f8)
HDFS-7305. NPE seen in wbhdfs FS while running SLive. Contributed by Jing Zhao.
HADOOP-11247. Fix a couple javac warnings in NFS. Contributed by Brandon Li.
HADOOP-11216. Improve Openssl library finding. (cmccabe via yliu)
HDFS-7263. Snapshot read can reveal future bytes for appended files. Contributed by Tao Luo.
YARN-2712. TestWorkPreservingRMRestart: Augment FS tests with queue and headroom checks. (Tsuyoshi Ozawa via kasha)
(cherry picked from commit 179cab81e0bde1af0cba6131ccccf16ff127358a)
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2