SPARK-1790: Update EC2 scripts to support r3 instance