Merge "Fix resource cleanup in server rescue tests"