Sync upstream master#1483

Alex-Welsh merged 6 commits intostackhpc/masterstackhpc/stackhpc-kayobe-config:stackhpc/masterfrom

sync-upstream/masterstackhpc/stackhpc-kayobe-config:sync-upstream/masterCopy head branch name to clipboard