Add CUSTOM_SETTINGS_MAPPINGS functionality to additional apps' settings.py
Report settings from additional applications to log file
Simplify code by passing in current module similarly to other modules
Reinstate the syncmedia command

This commit reinstates the syncmedia command.  It is useful for people
who are deploying with other WSGI servers such as Gunicorn.
Merge pull request #23 from knabar/fix-11588-config-get

Fix "config get" bug
reorder columns in _fs_deletelog table

For beta2 _fs_log_delete() should be changed to have,
INSERT INTO _fs_deletelog (event_id, file_id, owner_id, group_id, "path", "name", repo, params)
    SELECT _current_or_new_event(), OLD.id, OLD.owner_id, OLD.group_id, OLD."path", OLD."name", OLD.repo, OLD.params;
to make it less brittle, but that will have to wait.
Don't require additional omeroweb apps to be within omeroweb
Add annotation and file IDs to FileAnnotation tooltip
Use the value not the rtype
Merge tag 'mainline_5_m002' into mainline_5

Merge point from upstream to be used for branch targeting
Merge remote-tracking branch 'glencoesoftware/mainline_5' into reinstate-syncmedia

Conflicts:
	components/tools/OmeroPy/src/omero/plugins/web.py
Fix NPE if no modulo for std (handle cases before modulo.)
fixing refresh action in jstree
Added username/password to bind in ldap discover cli
Added paging to handle large result sets larger than server limits
Added case insensetive DN comparison
PEP8 formatted code
Set criticality to False for compatability for LDAP without paging extension
Handle empty serverctrls
Fetch all experiments by name at once
Fixed repeatedly checking the same DN against the oldDN recorded in OMERO