Remove double import
Add JYTHON_HOME to proc env and tidy up

For non-standard installs of jython, @manics has pointed
out that JYTHON_HOME needs to be propagated to the script
environment. If this is intended to be extensible, then
likely it will be necessary to let third-parties add to the
list of copied variables.
Merge pull request #1350 from sbesson/rebased/develop/matlab_updateoriginalfile

OMERO.matlab: add functions to update file annotations (rebased onto develop)
Merge pull request #1353 from sbesson/rebased/develop/11289_cli_perms

Fix CLI `omero group perms` subcommmand (rebased onto develop)
Merge pull request #1354 from sbesson/rebased/develop/matlab_exporter

OMERO.matlab: fix OME-TIFF export for large images (rebased onto develop)
Add a hook so additional scripts can be run after creating VM
merge develop -D org -I include -E exclude: PR 1132 (Repository API)
merge develop -D org -I include -E exclude: PR 1324 (Jython scripts (See #918))
merge develop -D org -I include -E exclude: PR 1326 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1342 (Python code examples and scripts for Paris develop)
merge develop -D org -I include -E exclude: PR 1357 (Import as bug develop)
merge develop -D org -I include -E exclude: PR 1359 (testGetTile() checks against getPlane(). See #11315)
merge develop -D org -I include -E exclude: PR 1361 (Add a hook so additional scripts can be run after creating VM)
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 1132 knabar 'Repository API'
  # PR 1324 joshmoore 'Jython scripts (See #918)'
  # PR 1326 snoopycrimecop 'Update develop submodules'
  # PR 1342 will-moore 'Python code examples and scripts for Paris develop'
  # PR 1357 jburel 'Import as bug develop'
  # PR 1359 will-moore 'testGetTile() checks against getPlane(). See #11315'
  # PR 1361 manics 'Add a hook so additional scripts can be run after creating VM'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 618 qidane 'Xml annotation'
  # PR 619 rleigh-dundee 'xsd-fu: Improve Timestamp date handling and precision'
  # PR 620 melissalinkert 'Add support for Lavision Imspector data'
  # PR 621 melissalinkert 'CellWorx: populate StartTime/EndTime on PlateAcquisition (rebased onto develop)'

Repository: ome/scripts
Already up-to-date.

Repository: openmicroscopy/ome-documentation
Updating 1946bb1..4e58081
Merged PRs:
  # PR 369 rleigh-dundee 'Cpp: Correct content and markup'
Conflicting PRs (not included):
  # PR 430 hflynn 'Sysadmin server overview tidy (rebased onto develop)'

Generated by OMERO-merge-develop#366 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-develop/366/)