Cleanup after created keypairs

* Added cleanup for keypairs that are generated during servers tests

Change-Id: I710e13edf2198e691609b462e1c138e66ce7698b
Merge "Cleanup after created keypairs"