CBD-6348: Merge remote-tracking branch 'couchbase/neo' into trinity

Forward merge with -s ours

* couchbase/neo:
  CBD-6348: [BP] Fix ambiguous == operator in unit test
  CBD-6348: [BP] CBStatCollector::formatKey Simplify dynamic format args handling
  CBD-6348: [BP] Changes required for folly v2022.02.14.00

Change-Id: I8eb6b65f8688cec0b9dd5639d5a0afefe6b7e6f5

Author: trondn