Split the generation of the CircleMarker options, when rendering a
portal, from the creation of the CircleMarker so that plugins can call
the portal rendering with custom CircleMarker options.
Merge commit 'f97ccebd44c0bed32e84d6185428709c70b79df7' into gh-pages