GEOS-5618: Remove references to getID() as they break feature chaining with joining.
Merge branch 'master' of git://github.com/geoserver/geoserver