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