Merge branch 'release-2.12' of github.com:codefresh-io/argo-cd into C…

Merge branch 'release-2.12' of github.com:codefresh-io/argo-cd into C… #2457