Add missing note about cancellation processing
Work on tests stability
Merge branch 'master' into stream
Flesh out zmq stream tests