master
JAVA-8764: Fix test/main directories structure
JAVA-10516: Revisit spring-boot module inside spring-boot-modules folder (#12038)