HDFS-6843. Create FileStatus isEncrypted() method (clamb via cmccabe)
HDFS-6843. Add to CHANGES.txt
HDFS-7075. hadoop-fuse-dfs fails because it cannot find JavaKeyStoreProvider$Factory. (cmccabe)
YARN-2558. Updated ContainerTokenIdentifier#read/write to use ContainerId#getContainerId. Contributed by Tsuyoshi OZAWA.
HADOOP-11016. KMS should support signing cookies with zookeeper secret manager. (tucu)
HADOOP-11040. Return value of read(ByteBuffer buf) in CryptoInputStream is incorrect in some cases. (Yi Liu via wang)
Move some HDFS JIRAs to the correct CHANGES.txt
HDFS-7004. Update KeyProvider instantiation to create by URI. (wang)
HDFS-7078. Fix listEZs to work correctly with snapshots. (wang)
YARN-2559. Fixed NPE in SystemMetricsPublisher when retrieving FinalApplicationStatus. Contributed by Zhijie Shen
Merge branch 'trunk' into HDFS-6584

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java