Some fixes to changes from merge
Added Spring Boot CLI module