master
[JAVA-38358] (#17257)
Merge pull request #8125 from eugenp/revert-8119-BAEL-3275-2
[JAVA-35730] Fix-formatting-of-POMs (#16882)