master
JAVA-11420: Dissolve spring-boot-1 and spring-boot-2 inside (#12122)
Merge pull request #8125 from eugenp/revert-8119-BAEL-3275-2