YARN-1250. Generic history service should support application-acls. (Contributed by Zhijie Shen)
YARN-1250. Addendum
HDFS-7072. Fix TestBlockManager and TestStorageMover.  Contributed by Jing Zhao
Merge branch 'trunk' into HDFS-6584