Merge branch 'master' into wyardley/fix_2104

Author: apeabody

test/integration/simple_zonal_private/testdata/TestSimpleZonalPrivate.json

@@ -83,7 +83,8 @@
         "displayName": "VPC"
       }
     ],
-    "enabled": true
+    "enabled": true,
+    "privateEndpointEnforcementEnabled": true
   },
   "monitoringConfig": {
     "componentConfig": {