[SPARK-2894][Core] Fixes spark-shell and pyspark CLI options#1864

liancheng wants to merge 2 commits intoapache:masterapache/spark:masterfrom

liancheng:spark-2894liancheng/spark:spark-2894Copy head branch name to clipboard