Updating dependencies for upgrade to Spring 4.0

Upgrade to latest Spring & servlet-api