fix #5607 Oracle SRID authority

git-svn-id: https://svn.osgeo.org/gdal/trunk@27571 f0d54148-0727-0410-94bb-9a71ac55c965
Removed some commented out code
Resolved some merge issues