HDFS-6979. hdfs.dll not produce .pdb files. Contributed by Chris Nauroth.
HDFS-6979. Fix minor error in CHANGES.txt. Contributed by Chris Nauroth.
HDFS-6862. Add missing timeout annotations to tests. (Contributed by Xiaoyu Yao)
HDFS-6998. warning message 'ssl.client.truststore.location has not been set' gets printed for hftp command. (Contributed by Xiaoyu Yao)
HADOOP-11052. hadoop_verify_secure_prereq's results aren't checked in bin/hdfs (aw)
HADOOP-11065. Rat check should exclude **/build/**. (kasha)
HADOOP-11067 [HDFS-6998]. Fix CHANGES.txt
YARN-2508. Cross Origin configuration parameters prefix are not honored (Mit Desai via jeagles)
HADOOP-11070. Create MiniKMS for testing. (tucu)
HADOOP-11069. KMSClientProvider should use getAuthenticationMethod() to determine if in proxyuser mode or not. (tucu)
HDFS-6986. DistributedFileSystem must get delegation tokens from configured KeyProvider. (zhz via tucu)
HDFS-6940. Refactoring to allow ConsensusNode implementation.
Contributed by Konstantin Shvachko.
YARN-2519. Credential Provider related unit tests failed on Windows. Contributed by Xiaoyu Yao.
HDFS-6898. DN must reserve space for a full block when an RBW block is created. (Contributed by Arpit Agarwal)
HDFS Credential Provider related Unit Test Failure. Contributed by Xiaoyu Yao.
YARN-2512. Allowed pattern matching for origins in CrossOriginFilter. Contributed by Jonathan Eagles.
YARN-2507. Documented CrossOriginFilter configurations for the timeline server. Contributed by Jonathan Eagles.
YARN-2515. Updated ConverterUtils#toContainerId to parse epoch. Contributed by Tsuyoshi OZAWA
Merge branch 'trunk' into HDFS-6584

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java