Upgrade to Spring Framework 4.0.9

Closes gh-2259
Merge branch '1.1.x'

Conflicts:
	spring-boot-dependencies/pom.xml