[ogr2ogr] Fix promote to multipart logic and add makevalid option

[ogr2ogr] Fix promote to multipart logic and add makevalid option #43718