Upstream catchup merge

[ear-dev]

We should consider.

[ear-dev]

Status: Upstream has some issues right now, and they have limited omnichannel functionality without an enterprise license. Could be that we are better off sticking with 5.1 for now.

Upstream Issues: @bhardwajaditya can you please document issues you are aware of that are problematic here?

[ear-dev]

6.0 looks good?

• Need to incorporate our changes in appsEngine while implementing mono-repo
• Check changes in agenda for mono-repo as well.