Rebase master with 0.11.0 changes

[reginapizza]

What type of PR is this? /kind chore

What does this PR do / why we need it:

• pulls in changes from release of 0.11.0
• fixes incomplete update of argocd upstream version to 2.11.6