Merge "test_rescued_vm_add_remove_security_group missing addCleanup"