Revert "Merge pull request #227 from r0bb3n/10.x-GEOT-4486_synonyms"

This reverts commit 309ef90b0ece06532bca0026061a08420a78cb37, reversing
changes made to 7e612b85c6eb564e2ff32a72d5a2a1a4f1a22b1c.
Merge branch 'master' of git://github.com/geotools/geotools