DATACASS-144: QueryCancellor -> Cancellable, BasicQueryCancellor -> ResultSetFutureCancellable, reformatted