Upgrade to Spring 4 and upgrade various libs