fix more build errors as part of moving to Spring 4.x