Update to spring-cloud version 1.0.0.RC1 and simplications