Merge remote-tracking branch 'couchbase/trinity' into trunk

Merged with -s ours as this is already present on master

* couchbase/trinity:
  MB-62722: Don't reschedule callback with full send buffer

Change-Id: I5dc19c47d93d239ada45f5cc6f63ac109306d9cd

Author: trondn