[SPARK-1897] Respect spark.jars and --jars in spark-shell

Spark shell currently overwrites `spark.jars` with `ADD_JARS`. This means the extra jars added through `bin/spark-shell --jars jar1,jar2` are discarded.