Upgrade to Spring Loaded 1.2.1.RELEASE

Closes gh-1474
Merge branch '1.1.x'

Conflicts:
	spring-boot-dependencies/pom.xml