REFAC: resolve conflicts between release-7.2 and develop

CI/deploy.sh

CMake/GetVersionFromGitTag.cmake

Data/Baseline/OTB/Files/ioTuImageMetadataAppendTest.txt

Data/Baseline/OTB/Files/ioTuImageMetadataCompactTest.txt

Data/Baseline/OTB/Files/ioTuImageMetadataMergeTest.txt

Data/Baseline/OTB/Files/ioTuImageMetadataSliceTest.txt

...line/OTB/Files/ioTuImageMetadataToFromKeywordlistTest.txt

Data/Baseline/OTB/Files/ioTuMetaDataKeyTest.txt

Data/Baseline/OTB/Files/ioTuotbXMLMetadataSupplierTest.txt

...ne/OTB/Files/ioTvImageMetadataInterfaceTest_Sentinel1.txt

Data/Input/ioTuotbXMLMetadataSupplierTest.xml

Documentation/Cookbook/_static/html/versions.html

Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h

Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx

Modules/Core/Common/include/otbStringUtilities.h

Modules/Core/Common/src/CMakeLists.txt

Modules/Core/Common/src/otbStringUtilities.cxx

Modules/Core/ImageBase/include/otbImage.h

Modules/Core/ImageBase/include/otbImage.hxx

Modules/Core/ImageBase/include/otbImageCommons.h