Cherry-pick multinode changes to stackhpc/2023.1#1451

Alex-Welsh merged 2 commits intostackhpc/2023.1stackhpc/stackhpc-kayobe-config:stackhpc/2023.1from

mn-minor-antelopestackhpc/stackhpc-kayobe-config:mn-minor-antelopeCopy head branch name to clipboard