master
JAVA-5223: Fix formatting of POMs (Part 2)
Merge pull request #8125 from eugenp/revert-8119-BAEL-3275-2