Merge V8_4_BR branch.

diff --cc CMakeLists.txt
Simple merge

diff --cc idl/SMESH_Mesh.idl
Simple merge

diff --cc src/SMESH/SMESH_Algo.cxx
Simple merge

diff --cc src/SMESH/SMESH_Mesh.cxx
Simple merge

diff --cc src/SMESHGUI/SMESHGUI.cxx
Simple merge

diff --cc src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
Simple merge

diff --cc src/SMESH_I/SMESH_2smeshpy.cxx
Simple merge

diff --cc src/SMESH_I/SMESH_DumpPython.cxx
Simple merge

diff --cc src/SMESH_I/SMESH_Filter_i.cxx
Simple merge

diff --cc src/SMESH_I/SMESH_Gen_i.cxx
Simple merge

diff --cc src/SMESH_I/SMESH_MeshEditor_i.cxx
Simple merge

diff --cc src/SMESH_I/SMESH_Mesh_i.cxx
Simple merge

diff --cc src/SMESH_SWIG/smeshBuilder.py
Simple merge