SPARK-1151: Update dev merge script to use spark.git instead of incubator-spark#47

tgravescs wants to merge 1 commit intoapache:masterapache/spark:masterfrom

tgravescs:fix_merge_scripttgravescs/spark:fix_merge_scriptCopy head branch name to clipboard