r6228/sofa-dev : FIX: clean code.
r6228/sofa-dev : FIX: clean code.

 //partial sync (1/2 changes)//

hdeling/sofa,Anatoscope/sofa,FabienPean/sofa,FabienPean/sofa,FabienPean/sofa,hdeling/sofa,FabienPean/sofa,hdeling/sofa,hdeling/sofa,hdeling/sofa,Anatoscope/sofa,Anatoscope/sofa,Anatoscope/sofa,FabienPean/sofa,hdeling/sofa,Anatoscope/sofa,FabienPean/sofa,hdeling/sofa,Anatoscope/sofa,hdeling/sofa,FabienPean/sofa,hdeling/sofa,FabienPean/sofa,hdeling/sofa,Anatoscope/sofa,FabienPean/sofa,FabienPean/sofa,Anatoscope/sofa,Anatoscope/sofa