More updates for Spring Boot

This change consists of more changes to handle the upgrade to Spring
Boot.