Upgrade to Spring 4.0.8.RELEASE

Closes gh-1785
Merge branch '1.1.x'

Conflicts:
	spring-boot-dependencies/pom.xml