Merge branch '2.1.x' into 2.2.x

Author: philwebb

ci/pipeline.yml

@@ -7,7 +7,7 @@ anchors:
   docker-resource-source: &docker-resource-source 
     username: ((docker-hub-username))
     password: ((docker-hub-password))
-    tag: ((branch))
+    tag: ((milestone))
   build-project-task-params: &build-project-task-params
     privileged: true
     timeout: ((task-timeout))