Merge in RED/persistence-service from feature/RED-3081 to master
* commit 'd537a16d655ddc2c8a52764bcaf4df5aaf8a7fa0':
RED-3081-As an admin of a dossier template I want to customize the highlighting color of a skipped redaction of an entity
Merge in RED/persistence-service from RED-4249-fix2 to master
* commit '1b3621db97f3ab6279edba72ce88375ab59a15d5':
RED-4249 - multiple watermarks per dossier template
Merge in RED/persistence-service from RED-4249-fix2 to master
* commit '67286ef7aa5a9b47d1036a64164774c49430b0f8':
RED-4249 - multiple watermarks per dossier template
RED-4249 - multiple watermarks per dossier template
Merge in RED/persistence-service from feature/RED-4249 to master
* commit 'ab5f644d33c88d8bcd4333d52451b79d800ee30a':
RED-4249-When I edit or create a dossier as an owner I want to select from multiple watermark configurations
- add columns id, name and enabled to watermark entity,
- removed watermarkEnabled and watermarkPreviewEnabled and added new dependencies to watermark_configuration
- updated tests
Merge in RED/persistence-service from RED-4219 to master
* commit 'f42eefba9a14ec0219a3bcf3d58bc1bbc8ccd10a':
RED-4219: Renalyse after accept/decline force/imageRecategorizations
Merge in RED/persistence-service from RED-4078-ps1 to master
* commit 'fe58e92b8f85fc1167c59e0cbc8694ec596f5de1':
RED-4078: Make sure that the dossier template can only be created with a proper name
Merge in RED/persistence-service from RED-4153-2 to master
* commit 'e4337bbedc75fbddc3566019aec92344a0abba61':
RED-4153: Getting all existing dossiers returns deleted archived dossiers
Merge in RED/persistence-service from RED-4040 to master
* commit '8e4bf87d1070764fcd57c4eb4e34e5bc52e1406a':
RED-4040 Bugfix, NullPointerException if file was already restored
Merge in RED/persistence-service from RED-4186 to master
* commit '1c8fe90b31b1df953ddd00cf7e2d69b79e6f3977':
RED-4186: Delete selected type also if deleting kms signature
Merge in RED/persistence-service from RED-4166 to master
* commit '91039f7acc402895d5cc4930f639421a1b0a6495':
RED-4166: Bugfix, delete fileAttributes if overwrite file
Merge in RED/persistence-service from RED-4186 to master
* commit 'ab085195d00a02d9815562e74dbdb08d3fac8907':
RED-4186: Delete also selected type if signature gets removed
Merge in RED/persistence-service from RED-4176 to master
* commit '91a8336d5c06739d5d7ab96db7b79b5a35fcfbf2':
RED-4176: Renealyse after update of annotation status for resize redactions
Merge in RED/persistence-service from feature/RED-4145_1 to master
* commit '9578ac4b0d6fd1751d9cedead88482c1a382f38b':
RED-4145-Dossier template stats updates
Merge in RED/persistence-service from RED-3749-revert to master
* commit '94e606dcfb6da1638f3b3052cb1bc45e1ddbe222':
RED-3749 Revert digital signature removal
RED-3749 Revert digital signature removal
Merge in RED/persistence-service from RED-4064 to master
* commit '60ff90d5d54626f2342cd076f11a681652f6420d':
RED-4064: Trigger reanalysis instead of analysis on resize redaction
Merge in RED/persistence-service from RED-4064 to master
* commit '6ad0f804dc209d8f741755756ac01c7b8b050cdf':
RED-4064: Always trigger reanalysis instead of surrounding text analysis when add a resize redaction
Merge in RED/persistence-service from RED-4028 to master
* commit '9ab92b86c2d358305231f0877acee692461debce':
RED-4028 - fixed error in hard delete file