parallelism tweaks for ec2
cleanup
Merge branch 'master' into ec2