Update dev merge script to use spark.git instead of incubator-spark