Hi, Due to the difference in the project structure between `master` and `release-2.x`, most cherry-picks between the two lines fail.
What do you think about adding the `log4j-api-test` and `log4j-core-test` modules also in `release-2.x`? This should limit the number of conflicts to the differences that matter. Piotr
