Merge pull request #6487 from greg0ire/4.0.x

Merge 3.8.x up into 4.0.x

Author: greg0ire

.github/workflows/continuous-integration.yml

@@ -460,7 +460,7 @@ jobs:
           MSSQL_COLLATION: "${{ matrix.collation }}"
 
         options: >-
-          --health-cmd "echo quit | /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -l 1 -U sa -P Doctrine2018"
+          --health-cmd "echo quit | /opt/mssql-tools18/bin/sqlcmd -C -S 127.0.0.1 -l 1 -U sa -P Doctrine2018"
 
         ports:
           - "1433:1433"