feat: CR-30234 3.1.5 repo server lock failure#432

reggie-k wants to merge 2 commits intosync-3.1.5codefresh-io/argo-cd:sync-3.1.5from

CR-30234-3.1.5-repo-server-lock-failurecodefresh-io/argo-cd:CR-30234-3.1.5-repo-server-lock-failureCopy head branch name to clipboard