Cherry-pick the https://issues.apache.org/jira/browse/SIS-409 fix from geoapi-4.0 branch.
36 files changed