XX-11381 Backout custom mongo C++ driver changes and introduce query with timeout

fixed merge error