SPARK-2116

If SPARK_CONF_DIR environment variable is set, search it for spark-defaults.conf.