2.5.x

All of these changes are in src/community/geoserver-sync. These changes correspond to integration testing we've been doing.