restore zero margins in ColorMap to restore matching of idealized and pixelized maps (#828)

Repairs the big shift. Leaves the incorrect rounding to be corrected.

enabled an automatic merge when the pipeline for 6aa00ead succeeds

merged

mentioned in commit 41caec97