This is done for the most part. The only piece left is to figure out how to best handle envers in 5.0, which will be a separate Jira I'll create/link later.