INT-2973 Fix 2.2.x Build with Spring 3.0.x

Remove 3.1 dependencies and tests.