Spring Boot 1.1.1.RELEASE

More changes to use Spring Boot 1.1.1.RELEASE