Merge HTML changes in javadoc from branch 'geoapi-4.0'.