Merge branch 'master' into 'akers-platform-1734'

# Conflicts:
#   Dockerfile

Dockerfile

 FROM ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}bitnami/kubectl:1.25 AS kubectl
 
-FROM ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}amazon/aws-cli:2.11.20
+FROM ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}amazon/aws-cli:2.11.21
 ENTRYPOINT []
 COPY --from=kubectl /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/kubectl