GEOT-4567: String constants in idExpression causes error
Merge branch 'master' of git://github.com/geotools/geotools