Merge in RED/persistence-service from 3.0-efsa-readiness to master * commit '6122080fc94cc1479e52951e82f504f146fb29c3': RED-2313
Merge in RED/persistence-service from 3.0-efsa-readiness to master * commit '6122080fc94cc1479e52951e82f504f146fb29c3': RED-2313