merge develop -D org -I include -E exclude: PR 594 (Blitz api5 11852)
merge develop -D org -I include -E exclude: PR 596 (document extra values for omero.fs.repo.path_rules (ticket #10822))