Upgrade to geoserver 2.5. Various tweaks to make upgrades easier.