Merge branch 'feature/aem-spring-boot' into 0.3.9

Merge branch 'feature/aem-spring-boot' into 0.3.9 #2673