Aap Updates for 2.5/2.6 plus cleanup#417

BBGrimmett2 wants to merge 7 commits into

redhat-cop:mainredhat-cop/gitops-catalog:mainfrom

BBGrimmett2:aap-updatesBBGrimmett2/gitops-catalog:aap-updatesCopy head branch name to clipboard