Adapt to spark 0.9.0 path