resolve conflicts between release-7.2 and gdal_dem_handler

Data/Baseline/OTB/Images/ioTvDEMToImageGenerator2.1.tif

Data/Input/DEM/egm96.grd.hdr

Data/Input/DEM_srtm/egm96.grd.hdr

Examples/BasicFilters/DEMToRainbowExample.cxx

Examples/BasicFilters/HillShadingExample.cxx

Examples/BasicFilters/test/CMakeLists.txt

Examples/DisparityMap/StereoReconstructionExample.cxx

Examples/IO/DEMHandlerExample.cxx

Examples/IO/DEMToImageGenerator.cxx

Examples/IO/test/CMakeLists.txt

Modules/Adapters/OSSIMAdapters/include/otbOssimDEMHandler.h

Modules/Adapters/OSSIMAdapters/otb-module.cmake

Modules/Adapters/OSSIMAdapters/src/CMakeLists.txt

Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx

Modules/Adapters/OSSIMAdapters/src/otbOssimDEMHandler.cxx

Modules/Adapters/OSSIMAdapters/test/CMakeLists.txt

Modules/Adapters/OSSIMAdapters/test/otbDEMHandlerTest.cxx

...dapters/OSSIMAdapters/test/otbOSSIMAdaptersTestDriver.cxx

...s/Adapters/OSSIMAdapters/test/otbRPCSolverAdapterTest.cxx

...lications/AppProjection/app/otbGenerateRPCSensorModel.cxx