Scripts do not use SPARK_CONF_DIR where they should

# Load extra JAVA_OPTS from conf/java-opts, if it exists
if [ -e "$FWDIR/conf/java-opts" ] ; then
  JAVA_OPTS="$JAVA_OPTS `cat "$FWDIR"/conf/java-opts`"
fi

DEFAULT_PROPERTIES_FILE="$SPARK_HOME/conf/spark-defaults.conf"