YARN-2033. Merging generic-history into the Timeline Store (Contributed by Zhijie Shen)