Fixed the integration test build issue
Fixed the integration test build issue - added missing jar, tweaked Spring dependencies to break it a different way
Fixed the integration test build issue - added missing jar, tweaked Spring dependencies to break it a different way
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.gradle