[SPARK-1896] Respect spark.master (and --master) before MASTER in spark-shell#846

andrewor14 wants to merge 1 commit intoapache:masterapache/spark:masterfrom

andrewor14:shell-masterandrewor14/spark:shell-masterCopy head branch name to clipboard