Port from trunk some changes which were necessary for the merge.
Those changes are mostly for helping the trunk to deal with the changes in GeoAPI,
which are not yet known to the trunk since the later is nailed down on GeoAPI 3.0.0.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK8@1626344 13f79535-47bb-0310-9956-ffa450edef68