Merge branch 'SALOME-8.2.0_porting'

Conflicts:
	src/SketchPlugin/Test/TestArcBehavior.py
	src/XGUI/CMakeLists.txt

diff --cc src/CollectionPlugin/CMakeLists.txt
Simple merge

diff --cc src/Model/Model_AttributeSelectionList.cpp
Simple merge

diff --cc src/SHAPERGUI/SHAPERGUI.cpp
Simple merge

diff --cc src/XGUI/CMakeLists.txt
Simple merge