2.x multi cluster improvements

[arzzon]

Description: Merge multiCluster enhancements to 2.x-master

Changes Proposed in PR:

Fixes: resolves #Github issue id

General Checklist

• [ ] Updated Added functionality/ bug fix in release notes
• [ ] Added examples for new feature
• [ ] Updated the documentation
• [ ] Smoke testing completed

CRD Checklist

• [ ] Updated required CR schema