Add ability to stop client test cleanly, bug fixes

BUG=None
TEST=Ran it

Change-Id: Id743526fe4e1df9df3dddf625a557fe2bf82253c
Reviewed-on: https://gerrit.chromium.org/gerrit/38411
Tested-by: Kris Rambish <krisr@chromium.org>
Reviewed-by: Craig Harrison <craigdh@chromium.org>
3 files changed