[SPARK-2260] Fix standalone-cluster mode, which was broken#1538

andrewor14 wants to merge 17 commits intoapache:masterapache/spark:masterfrom

andrewor14:standalone-clusterandrewor14/spark:standalone-clusterCopy head branch name to clipboard