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
Add support for experimental properties markup in omero.properties
Do not blacklist individual properties
Removing print statements from webgateway/util.py
OMERO.editor deprecation: remove from the build system
Fix build target
Use DEVELOPMENT rather than EXPERIMENTAL to match OMERO.web properties
omero.properties: add DEV explanation
Use HTTP rather than HTTPS
Update the exception handling in "login".
Fixed a ClassCastException
add newly annotation entities to disk usage count

arising from https://github.com/openmicroscopy/openmicroscopy/pull/2412
include pyramid lock files in disk usage calculation