rebase PR and take spark.master over master

Author: zjffdu

R/pkg/R/sparkR.R

@@ -368,30 +368,6 @@ sparkR.session <- function(
     }
     overrideEnvs(sparkConfigMap, paramMap)
   }
-<<<<<<< 8f0c35a4d0dd458719627be5f524792bf244d70a
-=======
-  if (nzchar(master)) {
-    sparkConfigMap[["spark.master"]] <- master
-  }
-
-  # do not download if it is run in the sparkR shell
-  if (!nzchar(master) || is_master_local(master)) {
-    if (!is_sparkR_shell()) {
-      if (is.na(file.info(sparkHome)$isdir)) {
-        msg <- paste0("Spark not found in SPARK_HOME: ",
-                      sparkHome,
-                      " .\nTo search in the cache directory. ",
-                      "Installation will start if not found.")
-        message(msg)
-        packageLocalDir <- install.spark()
-        sparkHome <- packageLocalDir
-      } else {
-        msg <- paste0("Spark package is found in SPARK_HOME: ", sparkHome)
-        message(msg)
-      }
-    }
-  }
->>>>>>> [SPARK-17210][SPARKR] sparkr.zip is not distributed to executors when run sparkr in RStudio
 
   if (!exists(".sparkRjsc", envir = .sparkREnv)) {
     retHome <- sparkCheckInstall(sparkHome, master)