Rebase and fix conflicts

Author: tlrx

x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/config/ConfigTests.java

@@ -16,7 +16,6 @@
 import org.elasticsearch.xpack.core.rollup.job.TermsGroupConfig;
 import org.joda.time.DateTimeZone;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;