Cleaning up + upgrading various dependencies

Conflicts:
	pom.xml
	services/idp/pom.xml
	services/sts/pom.xml
	systests/jetty8/pom.xml
	systests/spring/pom.xml
	systests/springPreauthWebapp/pom.xml
	systests/tomcat7/pom.xml