Fix build problems due to recent ConnId AD bundle upgrade; upgrading some other deps as well
Merge branch '1_1_X' into 1_2_X

Conflicts:
	pom.xml
Upgrading Spring
Merge branch '1_2_X'