Merge branch '2.1.x' into 2.2.x

Author: philwebb

ci/pipeline.yml

@@ -87,12 +87,12 @@ resource_types:
 resources:
 - name: git-repo
   type: git
-  icon: github-circle
+  icon: github
   source:
     <<: *git-repo-resource-source
 - name: git-repo-windows
   type: git
-  icon: github-circle
+  icon: github
   source: 
     <<: *git-repo-resource-source
     git_config:
@@ -125,7 +125,7 @@ resources:
     pre_release: false
 - name: ci-images-git-repo
   type: git
-  icon: github-circle
+  icon: github
   source:
     uri: ((github-repo))
     branch: ((branch))