Merge pull request juju#17269 from jack-w-shaw/3.1-into-3.3

juju#17269

Forward merge:
- juju#17137
- juju#17145
- juju#17146
- juju#17172
- juju#17267

Conflicts:
- .github/workflows/client-tests.yml
- go.mod
- go.sum
- scripts/win-installer/setup.iss
- snap/snapcraft.yaml
- version/version.go

Conflicts were trivial to solve

.github/workflows/client-tests.yml

@@ -42,12 +42,21 @@ jobs:
       run: |
         make install-mongo-dependencies
 
-    - name: "Install musl & dqlite  (Ubuntu)"
+    - name: "Install musl & dqlite (Ubuntu)"
       if: (matrix.os == 'ubuntu-latest')
       shell: bash
       run: |
         sudo make MUSL_CROSS_COMPILE=0 musl-install dqlite-install
 
+    - name: "Install Mongo Dependencies (macOS)"
+      if: (matrix.os == 'macOS-latest')
+      run: |
+        brew tap mongodb/brew
+        brew update
+        brew install [email protected]
+        brew link [email protected]
+        brew services start mongodb/brew/[email protected]
+
     - name: "Test client (Ubuntu)"
       if: (matrix.os == 'ubuntu-latest')
       shell: bash