Upgrade to Spring Boot 0.5.0.M6 and switch over to maven macros