Honor wait on ec2 instance termination
Merge pull request #4776 from jlaska/ec2_wait_on_terminate

Honor wait on ec2 instance termination