ec2 - Updating for infra changes
Bypass unexpected popup in server_roles

(cherry picked from commit f9ebb918840cebddc103178d539f1b35d5aa0e9b)
This commit was lost in the merge of #172, my apologies
Merge pull request #182 from rlandy/retirement_tests

ec2 provisioning test
More flakey goodness