Upgrade to Spring-framework 4.x and spring-cloud