Merge pull request #1799 from bpindelski/test2628

Fix intermittent test failures in OmeroPy-integration-stable.
Fix SPW delete test timeouts (see #11540).
Touch Django files after extracting to force them to be copied into dist
Merge pull request #1823 from jburel/npe-importer-dev_4_4

Initialize table before file chooser.
Explain non-ID copying
merge dev_4_4 -D org -I include -E exclude: PR 1690 (Webfigure TEMP)
merge dev_4_4 -D org -I include -E exclude: PR 1805 (Upgrade ICE jars to version 3.5.1 (4.4))
merge dev_4_4 -D org -I include -E exclude: PR 1819 (Update dev_4_4 submodules)
merge dev_4_4 -D org -I include -E exclude: PR 1827 (ldap discover username/password fix, paging and dn check (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 1831 (fix #10581: getTile byte-ordering issue (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 1834 (#11723 adding FORCE_SCRIPT_NAME to the settings.py (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 1839 (Error handling of tile image loading in PanoJS See #11709)
merge dev_4_4 -D org -I include -E exclude: PR 1843 (Disable chgrp event logs)
merge dev_4_4 -D org -I include -E exclude: PR 1848 (11709 tile access)
merge dev_4_4 -D org -I include -E exclude: PR 1850 (dev_4_4: Extract Django when it's missing or is the wrong version)
merge dev_4_4 -D org -I include -E exclude: PR 1855 (Fix SPW delete test timeouts (see #11540). (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.

Merged PRs:
  # PR 1690 will-moore 'Webfigure TEMP'
  # PR 1805 rleigh-dundee 'Upgrade ICE jars to version 3.5.1 (4.4)'
  # PR 1819 snoopycrimecop 'Update dev_4_4 submodules'
  # PR 1827 dpwrussell 'ldap discover username/password fix, paging and dn check (rebased onto dev_4_4)'
  # PR 1831 ximenesuk 'fix #10581: getTile byte-ordering issue (rebased onto dev_4_4)'
  # PR 1834 aleksandra-tarkowska '#11723 adding FORCE_SCRIPT_NAME to the settings.py (rebased onto dev_4_4)'
  # PR 1839 will-moore 'Error handling of tile image loading in PanoJS See #11709'
  # PR 1843 joshmoore 'Disable chgrp event logs'
  # PR 1848 joshmoore '11709 tile access'
  # PR 1850 knabar 'dev_4_4: Extract Django when it's missing or is the wrong version'
  # PR 1855 bpindelski 'Fix SPW delete test timeouts (see #11540). (rebased onto dev_4_4)'

Repository: openmicroscopy/bioformats
Updating 5c64b29..dfcbbd0
Merged PRs (fast-forward):
  # PR 808 hflynn 'Tidying ITK user doc page'

Merged PRs:
  # PR 811 melissalinkert 'Set version information in Maven'

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

Merged PRs:
  # PR 53 will-moore 'Initial commit of Figure_To_Pdf.py'

Repository: openmicroscopy/ome-documentation
Already up-to-date.

Merged PRs:
  # PR 559 mtbc 'remind that model changes may affect IceMapper (rebased)'

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