Merge "Cleanup and rename test_create_ebs_image_and_check_boot"