[SPARK-12413] Fix Mesos ZK persistence

I believe this fixes SPARK-12413.  I'm currently running an integration test to verify.

Author: Michael Gummelt <[email protected]>

Closes apache#10366 from mgummelt/fix-zk-mesos.

Author: Michael Gummelt

core/src/main/scala/org/apache/spark/deploy/rest/mesos/MesosRestServer.scala

@@ -99,7 +99,11 @@ private[mesos] class MesosSubmitRequestServlet(
     // cause spark-submit script to look for files in SPARK_HOME instead.
     // We only need the ability to specify where to find spark-submit script
     // which user can user spark.executor.home or spark.home configurations.
-    val environmentVariables = request.environmentVariables.filterKeys(!_.equals("SPARK_HOME"))
+    //
+    // Do not use `filterKeys` here to avoid SI-6654, which breaks ZK persistence
+    val environmentVariables = request.environmentVariables.filter { case (k, _) =>
+      k != "SPARK_HOME"
+    }
     val name = request.sparkProperties.get("spark.app.name").getOrElse(mainClass)
 
     // Construct driver description