[SPARK-4161]Spark shell class path is not correctly set if "spark.driver.extraClassP...

...ath" is set in defaults.conf.(branch-1.1 backport)