WorkspaceBagger: Use, in order of preference, f.basename, f.contentids and f.ID for filenames#1157

kba wants to merge 2 commits intomasterOCR-D/core:masterfrom

contentidsOCR-D/core:contentidsCopy head branch name to clipboard