Option to disconnect on cancellation of running query

Done in client.py.
reverted cancellation in thirftclient

since cancellation of cqlclient will call its disconnect which will call
thrift client's disconnect