YARN-2743. Fixed a bug in ResourceManager that was causing RMDelegationToken identifiers to be tampered and thus causing app submission failures in secure mode. Contributed by Jian He.
HADOOP-11170. Pulling into branch-2.6 also, fixing CHANGES.txt.
YARN-2734. Skipped sub-folders in the local log dir when aggregating logs. Contributed by Xuan Gong.
HADOOP-11236. NFS: Fix javadoc warning in RpcProgram.java. Contributed by Abhiraj Butala. (harsh)
HDFS-6538. Comment format error in ShortCircuitRegistry javadoc. Contributed by David Luo. (harsh)
Adjusted the annotation.
Merge branch 'trunk' into sharedcache-4-YARN-2186-uploader