BS-9319_DevCollabImprSVN

Conflicts:
	bundles/plugins/org.bonitasoft.studio.condition.ui/src/org/bonitasoft/studio/condition/ui/expression/ComparisonExpressionValidator.java
	bundles/plugins/org.bonitasoft.studio.diagram.custom/src/org/bonitasoft/studio/diagram/custom/repository/DiagramFileStore.java
	bundles/plugins/org.bonitasoft.studio.migration/src-test/java/org/bonitasoft/studio/migration/custom/migration/form/FileWidgetDocumentMigrationTest.java
	bundles/plugins/org.bonitasoft.studio.migration/src/org/bonitasoft/studio/migration/custom/migration/form/FileWidgetDocumentMigration.java