GBE-433: Shapefile upload failes on backslash in attribute
GBE-432 Shapefile upload fails with zipfile created on Mac
Merge branch 'GBE-433' into magdageo-2.4.0-M1
Merge branch 'GBE-432' into magdageo-2.4.0-M1