Qualify which feature type the property is not part of
Merge branch 'master' of git://github.com/geoserver/geoserver