Backport #663 'Fix Unicode handling in OGDSUpdater'

Backport #663 to `4.0-stable` branch.

@phgross @deiferni