Merge fixes from branch 'geoapi-4.0' into geoapi-3.1;

* GML and WKT parsing fixes.
* https://issues.apache.org/jira/browse/SIS-555
* https://issues.apache.org/jira/browse/SIS-166 partially reverted.