Minor Fixes for Issues Found During `terragrunt-apply-all-everywhere`

* Fixes issue with salt-master variable in interconnect cloud-init

To be tagged v1.20.9

base/interconnects/cloud-init/cloud-init.tpl

@@ -9,7 +9,7 @@ write_files:
     ${fqdn}
   path: /etc/salt/minion_id
 - content: |
-    master: ${salt_master}
+    master: ${saltmaster}
   path: /etc/salt/minion
 - content: |
     grains: