Cherry pick from develop to release-3.13#6824

hanwen-cluster merged 3 commits intoaws:release-3.13aws/aws-parallelcluster:release-3.13from

hanwen-cluster:release-3.13hanwen-cluster/aws-parallelcluster:release-3.13Copy head branch name to clipboard