backport geojson plugin fixes from master - refs #2319 and 2367