Merge "Revert "don't reuse servers in test_server_actions""