Fix bad merge- use correct version of mesos/spark-ec2