Handle ^C from client

WIP - depends on swiftclient change

Change-Id: Ic88b142a40c548141be4b40a15f94b71603814e9