Merge "Use state transition checker wait function in the ec2 image tests"