Merge "TestServerAdvancedOps server leaking"