fix: [cherry-pick] selfhealattemptscount needs to be reset at times (#22095, #20978)#22583

rumstead merged 2 commits intoargoproj:release-2.14argoproj/argo-cd:release-2.14from

Aaron-9900:cherry-pick-e6f94f-release-2.14Aaron-9900/argo-cd:cherry-pick-e6f94f-release-2.14Copy head branch name to clipboard