[SPARK-2678] Follow-up commit for #1715 #1801, spark-shell is broken

[chutium]

all options are not working...
just run spark-shell with any options, such as --master
./bin/spark-shell --master local[2]
will get error message
bad option: '--master'

then oevr!...

more detail: #1801 (comment)

[SparkQA]

QA tests have started for PR 1861. This patch merges cleanly.
View progress: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/18228/consoleFull

[chutium]

maybe spark-shell.cmd should also be changed?

according to #1801 (comment)

cmd /V /E /C %SPARK_HOME%\bin\spark-submit.cmd spark-shell --class org.apache.spark.repl.Main %*

must be changed to

cmd /V /E /C %SPARK_HOME%\bin\spark-submit.cmd %* --class org.apache.spark.repl.Main spark-shell

right? spark-shell is the so called [app options] , so it should be the last augment ?

[SparkQA]

QA tests have started for PR 1861. This patch merges cleanly.
View progress: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/18229/consoleFull

[SparkQA]

QA results for PR 1861:
- This patch PASSES unit tests.
- This patch merges cleanly
- This patch adds no public classes

For more information see test ouptut:
https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/18228/consoleFull

[SparkQA]

QA results for PR 1861:
- This patch PASSES unit tests.
- This patch merges cleanly
- This patch adds no public classes

For more information see test ouptut:
https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/18229/consoleFull