[SPARK-4161]Spark shell class path is not correctly set if "spark.driver.extraClassPath" is set in defaults.conf

We probably need to add the Java option here, too, so that it works with newer JDK versions.  If you go through the `git blame` history, it looks like this branch was added because`MaxPermSize` doesn't work on newer Java versions.