MB-51513: Merge 'couchbase/cheshire-cat' into 'couchbase/neo'

No actual change to merge, but branches are out of sync from
a backport of MB-50874. Tagged as MB-51513 to allow forward merge
of that fix

* couchbase/cheshire-cat:

Change-Id: I002776a0e307c29f3d9af7facfe0dc5b4d33aba2

Author: jimwwalker