ported repl improvements from master

repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala

@@ -915,6 +915,10 @@ class SparkILoop(in0: Option[BufferedReader], protected val out: JPrintWriter,
   }
 
   def createSparkContext(): SparkContext = {
+   val uri = System.getenv("SPARK_EXECUTOR_URI")
+   if (uri != null) {
+         System.setProperty("spark.executor.uri", uri)
+   }
     val master = this.master match {
       case Some(m) => m
       case None => {

repl/src/main/scala/org/apache/spark/repl/SparkImports.scala

@@ -185,8 +185,13 @@ trait SparkImports {
             if (currentImps contains imv) addWrapper()
             val objName = req.lineRep.readPath
             val valName = "$VAL" + newValId();
-            code.append("val " + valName + " = " + objName + ".INSTANCE;\n")
-            code.append("import " + valName + req.accessPath + ".`" + imv + "`;\n")
+            
+            if(!code.toString.endsWith(".`" + imv + "`;\n")) { // Which means already imported
+               code.append("val " + valName + " = " + objName + ".INSTANCE;\n")
+               code.append("import " + valName + req.accessPath + ".`" + imv + "`;\n")
+            }
+            // code.append("val " + valName + " = " + objName + ".INSTANCE;\n")
+            // code.append("import " + valName + req.accessPath + ".`" + imv + "`;\n")
             // code append ("import " + (req fullPath imv) + "\n")
             currentImps += imv
           }