Salome HOME
Merge fixes from SALOME_3 branch