support for GDAL >= 2.0 in ogr plugin - refs #2259
improvements to GDAL 2.x handling - refs #2259 amends cbdd112223b42576