GEOS-5796 X-Paths with predicates only work with @attribute references
Merge branch 'master' of git://github.com/geoserver/geoserver