Merge "Remove not used server creation from test_server_rescue"