Merge branch 'aws-integration-merge' into 'master'

Allow temporary credentials to list files in a given S3 folder

See merge request !379 (merged)

(cherry picked from commit fb88bb26)

e85436ab Fix file service access to file collection path. f680f1f1 Fix unit test 81566ad8 Squashed commit of the following