Rename all mentions of GDAL 2.0 to be GDAL 1.11

git-svn-id: https://svn.osgeo.org/gdal/trunk@27110 f0d54148-0727-0410-94bb-9a71ac55c965
Fix compiler warning

git-svn-id: https://svn.osgeo.org/gdal/trunk@27111 f0d54148-0727-0410-94bb-9a71ac55c965
Merge branch 'trunk' into trunk_travis_macosx