Merge branch '2.1.x' into 2.2.x

Closes gh-20159

Author: snicoll

ci/images/setup.sh

@@ -29,7 +29,7 @@ test -f /opt/openjdk/bin/javac
 ###########################################################
 
 cd /
-curl -L https://download.docker.com/linux/static/stable/x86_64/docker-19.03.2.tgz | tar zx
+curl -L https://download.docker.com/linux/static/stable/x86_64/docker-19.03.5.tgz | tar zx
 mv /docker/* /bin/
 chmod +x /bin/docker*