ENH: synchronize with develop and resolve conflicts

.mailmap

CI/deploy.sh

CMake/FindMuParser.cmake

CMake/GetVersionFromGitTag.cmake

CMake/OTBSetStandardCompilerFlags.cmake

CMakeLists.txt

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/CMakeLists.txt

Documentation/Cookbook/rst/Monteverdi.rst

Documentation/Cookbook/rst/QGISInterface.rst

Documentation/Cookbook/rst/conf.py.in

Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h