Downloads preserves directories of original files
Merge remote-tracking branch 'origin/develop' into download_directory_structure

Conflicts:
	components/tools/OmeroWeb/omeroweb/webgateway/views.py
Merge remote-tracking branch 'origin/develop' into download_directory_structure
Use filesetPrefix to pick download directory structure
zip_archived_files() method within webgateway/views.py
Fix bug in download of 4.4 archived images
Moved zip_archived_files() into webgateway/util.py
Merge remote-tracking branch 'origin/develop' into download_directory_structure

Conflicts:
	components/tools/OmeroWeb/omeroweb/webgateway/views.py
Removing print statements from webgateway/util.py
Merge pull request #2985 from will-moore/download_directory_structure

Download preserves directories of original files