Don't assume we can build the sample feature from the original layer if there is a vector transformation in the middle
Merge branch 'master' of git://github.com/geoserver/geoserver