Merge remote-tracking branch 'origin/develop' into extra-annotations
Merge remote-tracking branch 'origin/develop' into extra-annotations

Conflicts:
	sql/psql/OMERO5.1DEV__5/OMERO5.0__0.sql
rebased OmeroPy/src/path.py onto upstream version 5.2
path.py: walk: "errors" now defaults to "ignore", consistently with os.walk
path.py: listdir: added "unreadable_as_empty" kwarg
updated lib/licenses
Moving to database schema dev9
Merge remote-tracking branch 'origin/develop' into extra-annotations

Conflicts:
	etc/omero.properties
	sql/psql/OMERO5.1DEV__5/enums_update.sql
	sql/psql/OMERO5.1DEV__5/psql-footer.sql
	sql/psql/OMERO5.1DEV__5/psql-header.sql
	sql/psql/OMERO5.1DEV__5/schema.sql
	sql/psql/OMERO5.1DEV__5/views.sql
	sql/psql/OMERO5.1DEV__8/OMERO5.0__0.sql
	sql/psql/OMERO5.1DEV__8/enums_update.sql
	sql/psql/OMERO5.1DEV__8/psql-footer.sql
	sql/psql/OMERO5.1DEV__8/psql-header.sql
	sql/psql/OMERO5.1DEV__8/schema.sql
	sql/psql/OMERO5.1DEV__8/views.sql
	sql/psql/OMERO5.1DEV__9/enums_update.sql
	sql/psql/OMERO5.1DEV__9/psql-footer.sql
	sql/psql/OMERO5.1DEV__9/psql-header.sql
	sql/psql/OMERO5.1DEV__9/schema.sql
	sql/psql/OMERO5.1DEV__9/views.sql
Prepare to switch to dev 9 DB schema
Step 2 of switch to dev 9 DB schema
Final step in moving to DB schema dev 9
Merge remote-tracking branch 'origin/develop' into extra-annotations
Permissions Test Matalb : Refactoring to Java : Database Setup
Permissions Test Matalb : Refactoring to Java : Database Setup : Fix bugs
Fix update in jsTree when Project / Dataset renamed
Handle Figure scripts with cross-group search results
Handle cross-group OME-TIFF export, E.g. from search results
Fix 'duplicate headers' bug in download original image
added test module for custom modifications to path.py
Blitz new method image.getThumbVersion()