Merge branch 'mattrpav-LOG4J2-2732'