Moving kill wait to the client (Part 1: client changes)

Bugs closed: AURORA-370

Reviewed at https://reviews.apache.org/r/20950/