Upgrade geoserver to 2.5