Merge "Don't use server_id class variable in _test_resize_server_confirm"