Merge branch '2.1.x' into 2.2.x

Closes gh-20803

Author: mbhave

ci/images/get-docker-url.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 set -e
 
-version="19.03.7"
+version="19.03.8"
 echo "https://download.docker.com/linux/static/stable/x86_64/docker-$version.tgz";