chore: sync all codefresh code changes into v3.1.5#439

ppapapetrou76 merged 2 commits intosync-3.1.5codefresh-io/argo-cd:sync-3.1.5from

cherry-pick-cf-changes-3-1-5codefresh-io/argo-cd:cherry-pick-cf-changes-3-1-5Copy head branch name to clipboard