RED-7384: migration fixes forward port Closes RED-7384 See merge request redactmanager/persistence-service!420