Add option to keep failed server

This can be useful when debugging.

Change-Id: Iaa1775ad3ba6cfd088ce3764e502019f611dde67
Merge "Add option to keep failed server"