SPARK-1559

Add conf dir to CLASSPATH dependent on whether SPARK_CONF_DIR is set or not.