Merge remote-tracking branch 'origin/master' into neon
Conflicts:
plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generate.xml
plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateErrorModel.xml
plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateFaultExtensions.xml
plugins/org.polarsys.chess.codegen.ada/tasks/generateInfrastructure.xml
plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/commands/InstantiateParamArchAsOssFileCommand.class
Change-Id: I0cc046654e50be0cffd12bb2df0b669fb4df147a