Fix the ordering of versions and dependencies in the dependencies pom
Merge branch '1.1.x'

Conflicts:
	spring-boot-dependencies/pom.xml