Devs, There are two PRs [1][2] to be merged soon that have several hundreds of files involved. One is to unify the line-endings and the other one to (finaly) upgrade log4j. please beware that this is going to cause you to resolve conflicts in your PRs.
regards, [1] https://github.com/apache/cloudstack/pull/7083 [2] https://github.com/apache/cloudstack/pull/7131 -- Daan