Update to Spring Boot 1.2.0 and simplifications