Make eager_sync_cancel_test cope if syncing finishes "too early" and also increase the number of messages to reduce possibility of other races (such as wait_for_syncing not being fast enough).
OK, that's just making CI time out...
Merge in default.