Merge "Update to Spring Boot 2"