Merge branch 'stable-2.15'

* stable-2.15:
  Consistently import utility methods from Collectors as static
  ListMailFilter: Static import from Collectors
  Fix plugin IT test for plugins using @PluginData annotation
  Update hooks plugin to latest revision on master

Change-Id: Ife8549cfaefb7a5ddab20164d8ac2ca23644d845

java/com/google/gerrit/acceptance/LightweightPluginDaemonTest.java

@@ -20,12 +20,16 @@ import com.google.gerrit.server.plugins.TestServerPlugin;
 import com.google.inject.Inject;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
 
 public class LightweightPluginDaemonTest extends AbstractDaemonTest {
   @Inject private PluginGuiceEnvironment env;
 
   @Inject private PluginUser.Factory pluginUserFactory;
 
+  @Rule public TemporaryFolder tempDataDir = new TemporaryFolder();
+
   private TestServerPlugin plugin;
 
   @Before
@@ -40,7 +44,8 @@ public class LightweightPluginDaemonTest extends AbstractDaemonTest {
             getClass().getClassLoader(),
             testPlugin.sysModule(),
             testPlugin.httpModule(),
-            testPlugin.sshModule());
+            testPlugin.sshModule(),
+            tempDataDir.getRoot().toPath());
 
     plugin.start(env);
     env.onStartPlugin(plugin);