Merge "Prevent any more JUnit 3 based tests on Ravenwood" into main