[GEOS-6379] Unable to add new default gridsets (Backport on 2.5.x)

Backport on the 2.5.x of the fix for JIRA: https://jira.codehaus.org/browse/GEOS-6379.