Merge pull request #3219 from neighbourhoodie/log4j-osgi-test-migration-junit5

Migrate `log4j-osgi-test` to JUnit 5