Merge branch '3.8.x' into 4.0.x

* 3.8.x:
  Revert the rename column feature (#6276)
  fix: TableDiff deprecation points to wrong method (#6273)
  Stop using chocolatey shims (#6269)
  Add explicit renameColumn method for Table (#6080)

.appveyor.yml

@@ -46,9 +46,9 @@ install:
     - ps: |
         # Check if installation is cached
         if (!(Test-Path c:\tools\php)) {
-          appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
+          appveyor-retry choco install --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
           # install sqlite
-          appveyor-retry cinst -y sqlite
+          appveyor-retry choco install -y sqlite
           Get-ChildItem -Path c:\tools\php
           cd c:\tools\php