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

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: https://github.com/apache/spark/pull/1801#issuecomment-51545117