Scale marker size to be the same in all viewports.
Merge branch '670-marker-scaling' into staging2
got default sizes ok for markers
fix merge conflict'
correct pngs for zero tests