[SPARK-2678] Follow-up commit, spark-shell.cmd should also be changed