Merge branch 'master' into 'MasterBugFixing'
Merge branch 'master' into 'MasterBugFixing'
Merge branch 'MasterBugFixing' into 'InnoBugFixing'
BS-2854, update unique constraint for table data_mapping for users that migrated before 1.4.0
BS-2854, add dependency to jdbc drivers
Merge branch 'master' into 'BS-6668_CustomPage'
fix merge migration BOS/SP
Merge branch 'BS-6668_CustomPage' into 'master'
Merge branch 'master' into InnoBugFixing
Merge branch 'master' into BS-1379_TransientData

Conflicts:
	bonita-migration-distrib/pom.xml