YARN-2565. Fixed RM to not use FileSystemApplicationHistoryStore unless explicitly set. Contributed by Zhijie Shen
HADOOP-10946. Fix a bunch of typos in log messages (Ray Chiang via aw)
MAPREDUCE-6091. YARNRunner.getJobStatus() fails with ApplicationNotFoundException if the job rolled off the RM view. Contributed by Sangjin Lee
YARN-2460. Remove obsolete entries from yarn-default.xml (Ray Chiang via aw)
HADOOP-10970. Cleanup KMS configuration keys. (wang)
HDFS-7046. HA NN can NPE upon transition to active. Contributed by
Kihwal Lee.
HADOOP-11112. TestKMSWithZK does not use KEY_PROVIDER_URI. (tucu via wang)
HDFS-7105. Fix TestJournalNode#testFailToStartWithBadConfig to match log output change. Contributed by Ray Chiang.
HDFS-7073. Allow falling back to a non-SASL connection on DataTransferProtocol in several edge cases. Contributed by Chris Nauroth.
HADOOP-11017. KMS delegation token secret manager should be able to use zookeeper as store. (asuresh via tucu)
Merge branch 'trunk' into HDFS-6581