Do not attempt to load obsolete single map width/height options (updates #31001)
Kill unnecessary margin-bottom in default map styles (updates #31001)