support old style keep-alives from cf client; better kills after tests

Signed-off-by: Alex Jackson <ajackson@pivotallabs.com>