Updating master to be the 2.5 series
Merge branch 'master' of git://github.com/geoserver/geoserver