Merge "Remove _stop_instances hack in test_volume_boot_pattern"