Reverting SparkBuild w.r.t to branch fork ratherh than current trunk to avoid diffs appearing