Make 'stream' OGR output compatible with FCGI with GDAL >= 2.0 (#4858)
Fix previous commit with GDAL version < 1.10 (#4858)
Fix syntax error

Missing || causes build failure when not using GDAL or OGR
Merge pull request #4939 from pagameba/patch-1

Fix syntax error
Merge branch 'master' of https://github.com/mapserver/mapserver into mapsherpa