maintenance merge of main into feature branch (#14393)

maintenance merge of `main` into feature branch
2023-10-09 14:28:35 -07:00
parent a85f399cac
commit eb327faabf
245 changed files with 6874 additions and 2031 deletions
@@ -19,6 +19,7 @@ spec:
    apple_bm_terms_expired: false
    enabled_and_configured: false
    windows_enabled_and_configured: false
+    enable_disk_encryption: false
    macos_migration:
      enable: false
      mode: ""
@@ -28,7 +29,6 @@ spec:
      deadline: null
    macos_settings:
      custom_settings:
-      enable_disk_encryption: false
    macos_setup:
      bootstrap_package:
      enable_end_user_authentication: false