Streamline end-to-end test and reduce enterprise diff

[kschiffer]

Summary

This PR backports common changes from the enterprise branch, merges latest v3.32 and fixes resulting conflicts and issues.

Changes

• Backport common changes from enterprise redesign branch
• Merge v3.32
• Fix resulting issues

Checklist

• Scope: The referenced issue is addressed, there are no unrelated changes.
• Compatibility: The changes are backwards compatible with existing API, storage, configuration and CLI, according to the compatibility commitments in README.md for the chosen target branch.
• Documentation: Relevant documentation is added or updated.
• [] Testing: The steps/process to test this feature are clearly explained including testing for regressions.
• Infrastructure: If infrastructural changes (e.g., new RPC, configuration) are needed, a separate issue is created in the infrastructural repositories.
• Changelog: Significant features, behavior changes, deprecations and fixes are added to CHANGELOG.md.
• Commits: Commit messages follow guidelines in CONTRIBUTING.md, there are no fixup commits left.