cdb0a418f8
Merge in RED/redaction-service from RED-6744 to master * commit '809349f65d7aa4af9ac5ca2fa75d80548d2f475b': RED-6744 - Merge dossier and template dictionaries in redaction-service - reformat - add junit test RED-6744 - Merge dossier and template dictionaries in redaction-service - remove unnecessary annotations RED-6744 - erge dossier and template dictionaries in redaction-service - extend DictionaryEntry from persistence to use it in merging dictionaries and to override the hascode and equals - use this DictionaryEntryModel instead of DictionaryEntry