Revert "SPARK-1099:Spark's local mode should probably respect spark.cores.max by default"

This reverts commit 16789317a34c1974f7b35960f06a7b51d8e0f29f. Jenkins was not run for this PR.