Mavenize a couple more libraries, roll back spring version updates so
that the ediscovery interface works again.