Merge branch 'master' into 'DataManagement'
Merge branch '6.3.x' into 'DataManagement'
Merge branch '6.3.x' into 'BS-8602_ProfilesImportExport'
BS-8660, migration of iconPath columns
Merge branch 'DataManagement' into 'BS-2683_DM_Compo'
fix pom version
fix pom bonita version
fix db filler 6.3.0
fix migration, added default files
Merge branch '6.3.x' into 'BS-8609_JREEmbedded'
Merge branch '6.3.x' into BS-8602_ProfilesImportExport

Conflicts:
	bonita-migration-db-filler-6.3.0/src/main/java/org/bonitasoft/migration/DatabaseFiller6_3_0.java
	bonita-migration-db-filler-6.3.1/pom.xml
	bonita-migration-db-filler-6.3.1/src/main/java/org/bonitasoft/migration/DatabaseChecker6_3_1.java
	pom.xml
Merge branch '6.3.x' into BS-8602_ProfilesImportExport
BS-8634, fix migration merge conflict
Merge branch '6.3.x' into 'BS-2683_DM_Compo'
Merge branch '6.3.x' into 'BS-2683_DM_Compo'
Merge branch '6.3.x' into 'BS-2683_DM_Compo'
Merge branch '6.3.x' into BS-8602_ProfilesImportExport

Conflicts:
	bonita-migration-integration-tests/build.gradle
Merge branch 'BS-8602_ProfilesImportExport' into '6.3.x'
Merge branch '6.3.x' into 'BS-8609_JREEmbedded'
Merge branch '6.3.x' into 'BS-2683_DM_Compo'