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.