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 InnoBugFixing
Merge branch 'master' into 'castorBugFixing'