improvements to GDAL 2.x handling - refs #2259 amends cbdd112223b42576