HADOOP-10880. Move HTTP delegation tokens out of URL querystring to a header. (tucu)
Fixing CHANGES.txt, moving HADOOP-8815 to 2.6.0 release
Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs following merge to branch-2

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-mapreduce-project/CHANGES.txt

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Fix typos in log messages. Contributed by Ray Chiang
Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
HDFS-6960. Bugfix in LazyWriter, fix test case and some refactoring. (Arpit Agarwal)
HDFS-6931. Move lazily persisted replicas to finalized directory on DN startup. (Arpit Agarwal)
Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581
HDFS-6969. Archival Storage: INode#getStoragePolicyID should always return the latest storage policy. Contributed by Jing Zhao.
MAPREDUCE-6058. native-task: KVTest and LargeKVTest should check mr job is sucessful (Contributed by Binglin Chang)
MAPREDUCE-6056. native-task: move system test working dir to target dir and cleanup test config xml files (Manu Zhang via bchang)
HADOOP-11036. Add build directory to .gitignore (Tsuyoshi OZAWA via aw)
HADOOP-11012. hadoop fs -text of zero-length file causes EOFException. Contributed by Eric Payne
HADOOP-10990. Add missed NFSv3 request and response classes. Contributed by Brandon Li
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/hadoop into trunk
HADOOP-11041. VersionInfo specifies subversion (Tsuyoshi OZAWA via aw)
HADOOP-10373 create tools/hadoop-amazon for aws/EMR support
Fix hadoop-common-project/hadoop-common/src/main/native/README to current mail list and URL
HDFS-6634. inotify in HDFS. Contributed by James Thomas.