clean up trys in test_servers

instead of manually doing a try / finally to do server cleanup, call
clear_servers in tearDown(). This dramatically simplifies the code.

Change-Id: I01bb8d32307fb4efd157d0742731f052ffd464f3
Merge "clean up trys in test_servers"