[SPARK-1894] Fix --driver-* options being ignored

The Spark submit options `--driver-*` were overridden by environment variables.