GEOS-5851 Make sure we don't synch up computing a non cacheable feature type each time we need a feature source
Merge branch 'master' of git://github.com/geoserver/geoserver
Fix build
Merge branch 'master' of git://github.com/geoserver/geoserver