Fix add by topic for Marker and MarkerArray

Forward port of #800