For cases where a manual-remove-redaction was applied to a redaction, that has multiple source (e.g. dictionary + rule), we still apply it when merging the redaction-log, instead of skipping it. This prevents a redaction from reappearing, when it has been removed by the user.
Merge in RED/persistence-service from RED-4515-swagger-fix to master
* commit '208c1397c86b8171c2a1d40a2106bba102aeb099':
RED-4515 - Swagger multitenancy fix
Merge in RED/persistence-service from RED-6440 to master
* commit '4c9ea27207ecfdcf3284095e239da2c256cd5484':
RED-6440 fixed point issue in manual redaction
Merge in RED/persistence-service from RED-4875_1 to master
* commit '7437ed3ebc3755bd24d7613b73df3a03a98f5df0':
RED-4875 - reformat code
RED-4875 - update version of pdftron-service to newest (release)
RED-4875 - set version of pdftron-service to latest
RED-4875 - delete tmp log
RED-4875 - add tmp log
RED-4875 - change version of pdftron-service to newest
RED-4875 - add new column keepHiddenText in dossiertemplate and corresponding classes/methods, and set version of pdftron-service to newest
Merge in RED/persistence-service from RED-6216 to master
* commit '274e82f79935ecea0f7977b9afca4c2145732a39':
RED-6216- Allow add-to-dict for expressions consisting of less than 2 characters
RED-6216- Allow add-to-dict for expressions consisting of less than 2 characters
Merge in RED/persistence-service from RED-6310 to master
* commit 'ac5406291ab286d793a23c674ecfe10b069cc734':
RED-6310: Fixed and cleaned up test after the merge from release 3.6
RED-6310: Changed element-collection fetch to eager because lazy loading runs into timing based errors
RED-6310: Updated test for download preparation test to execute all preparation steps.
Merge in RED/persistence-service from RED-4874_2 to master
* commit 'dc1f1c3562f5c4546dd5810f7be398bfe6311d4b':
RED-4874 - only slighty change of a comment for bamboo-test
RED-4874 - add column keepImageMetadata to CreateOrUpdateDossierTemplateRequest
RED-4874 - activated keepImageMetaData and set pdftron-version to newest