GEOT-4554: Joining generates SQL with empty ON()
Merge branch 'master' of git://github.com/geotools/geotools