Add HDFS-7148 to CHANGES.txt, branch-2 only commit.
HADOOP-11140. hadoop-aws only need test-scoped dependency on hadoop-common's tests jar. Contributed by Juan Yu.
MAPREDUCE-5831. Make MR client ignore unknown counters received from AM. Contributed by Junping Du.
CHANGES.txt: move HDFS-6584 and its subtasks to Release 2.6.0.
HDFS-6956. Allow dynamically changing the tracing level in Hadoop servers (cmccabe)
YARN-2577. Clarify ACL delimiter and how to configure ACL groups only (Mikos Christine via aw)
Merge branch 'trunk' into HDFS-6581
HADOOP-8808. Update FsShell documentation to mention deprecation of some of the commands, and mention alternatives (Akira AJISAKA via aw)
MAPREDUCE-6073. Description of mapreduce.job.speculative.slowtaskthreshold in mapred-default should be moved into description tags (Tsuyoshi OZAWA via aw)
HADOOP-10954. Adding site documents of hadoop-tools (Masatake Iwasaki via aw)
HDFS-6664. HDFS permissions guide documentation states incorrect default group mapping class. (Ray Chiang via aw)
YARN-2372. There are Chinese Characters in the FairScheduler's document (Fengdong Yu via aw)
HADOOP-11048. user/custom LogManager fails to load if the client classloader is enabled. Contributed by Sangjin Lee
MAPREDUCE-5796. Use current version of the archive name in DistributedCacheDeploy document (Akira AJISAKA via aw)
MAPREDUCE-5945. Update the description of GenericOptionsParser -jt option (Akira AJISAKA via aw)
HADOOP-10731. Remove @date JavaDoc comment in ProgramDriver class (Henry Saputra via aw)
HADOOP-10552. Fix usage and example at FileSystemShell.apt.vm (Kenji Kikushima via aw)
HDFS-7155. Bugfix in createLocatedFileStatus caused by bad merge. (Arpit Agarwal)
Merge branch 'trunk' into HDFS-6581