Fix rebase conflict

Author: jerryshao

streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala

@@ -43,7 +43,7 @@ class Checkpoint(@transient ssc: StreamingContext, val checkpointTime: Time)
   val delaySeconds = MetadataCleaner.getDelaySeconds(ssc.conf)
   val sparkConfPairs = ssc.conf.getAll.filterNot { kv =>
     (!ssc.sc.isDriverHostSetByUser && kv._1 == "spark.driver.host") ||
-      (!ssc.sc.isDriverPortSetByUser && kv._1 == "spark.driver.port")
+      (!ssc.sc.isDriverPortSetByUser && kv._1 == "spark.driver.port") }
 
   def createSparkConf(): SparkConf = {
     val newSparkConf = new SparkConf(loadDefaults = false).setAll(sparkConfPairs)

streaming/src/test/scala/org/apache/spark/streaming/CheckpointSuite.scala

@@ -209,7 +209,7 @@ class CheckpointSuite extends TestSuiteBase {
     // Serialize/deserialize to simulate write to storage and reading it back
     val newCp = Utils.deserialize[Checkpoint](Utils.serialize(cp))
 
-    val newCpConf = newCp.sparkConf
+    val newCpConf = newCp.createSparkConf()
     assert(newCpConf.contains("spark.driver.host"))
     assert(newCpConf.contains("spark.driver.port"))
     assert(newCpConf.get("spark.driver.host") === "localhost")