Merge branch 'aca' into aks

Author: dantelmomsft

.devcontainer/devcontainer.json

@@ -3,7 +3,9 @@
     "image": "mcr.microsoft.com/devcontainers/java:1-17-bullseye",
     "features": {
         "azure-cli": "latest",
-        "ghcr.io/azure/azure-dev/azd:latest": {},
+        "ghcr.io/azure/azure-dev/azd:latest": {
+            "version": "1.7.0"
+        },
         "ghcr.io/devcontainers/features/java:1": {
             "version": "none",
             "installMaven": true,