Merge branch 'stable-2.15'

* stable-2.15:
  DeleteWatchedProjects: Ignore null values from input list

Change-Id: Ia23ac0f9f68b8fdbbcfb6b0166e61e482ef30eef

gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteWatchedProjects.java

@@ -34,6 +34,7 @@ import com.google.inject.Provider;
 import com.google.inject.Singleton;
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 import org.eclipse.jgit.errors.ConfigInvalidException;
 
 @Singleton
@@ -72,6 +73,7 @@ public class DeleteWatchedProjects
         accountId,
         input
             .stream()
+            .filter(Objects::nonNull)
             .map(w -> ProjectWatchKey.create(new Project.NameKey(w.project), w.filter))
             .collect(toList()));
     accountCache.evict(accountId);