Merge pull request #1437 from mtbc/activities-npe-10561

fix #10561: make user object getting robust to no experimenter in tree
web port change from 8080 to 8000

suggested by @jburel
Merge pull request #1422 from bpindelski/11274-oj-refactor

Clean up OmeroJava (see #11274)
Merge pull request #1423 from snoopycrimecop/merge/dev_4_4/submodules

Update dev_4_4 submodules
merge dev_4_4 -D org -I include -E exclude: PR 1126 (Fix long-missing DELETE EventLogs)
merge dev_4_4 -D org -I include -E exclude: PR 1321 (Insight connectors dev 4 4)
merge dev_4_4 -D org -I include -E exclude: PR 1409 (Python integration test fixes  and introduction of pytest)
merge dev_4_4 -D org -I include -E exclude: PR 1417 (Make JDK 1.6 the minimum supported version (dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 1424 (Automated UI testing with Robot Framework)
merge dev_4_4 -D org -I include -E exclude: PR 1431 (List orphans 11413)
merge dev_4_4 -D org -I include -E exclude: PR 1432 (run_script() handles 'No Processor Available')
merge dev_4_4 -D org -I include -E exclude: PR 1433 (Dataset creation 11048)
merge dev_4_4 -D org -I include -E exclude: PR 1436 (fix #11371: adjust script delete to target specific script file name)
merge dev_4_4 -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 1126 joshmoore 'Fix long-missing DELETE EventLogs'
  # PR 1321 jburel 'Insight connectors dev 4 4'
  # PR 1409 ximenesuk 'Python integration test fixes  and introduction of pytest'
  # PR 1417 rleigh-dundee 'Make JDK 1.6 the minimum supported version (dev_4_4)'
  # PR 1424 mtbc 'Automated UI testing with Robot Framework'
  # PR 1431 aleksandra-tarkowska 'List orphans 11413'
  # PR 1432 will-moore 'run_script() handles 'No Processor Available''
  # PR 1433 will-moore 'Dataset creation 11048'
  # PR 1436 mtbc 'fix #11371: adjust script delete to target specific script file name'
Conflicting PRs (not included):
  # PR 1429 mtbc 'fix #11360: get the servant holder from the session factory into the raw file store'
  # PR 1438 cneves 'Moving omeroweb unittests to pytest'
  # PR 1439 cneves 'Moving omero.gateway tests to pytest'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 622 ctrueden 'Upgrade SLF4J to 1.7.2 [dev_4_4]'
  # PR 653 rleigh-dundee 'Make JDK 1.6 the minimum supported version (dev_4_4)'
  # PR 672 melissalinkert 'AVI: fix array index calculation for tile reading (rebased onto dev_4_4)'
  # PR 673 melissalinkert 'Make configuration file suffix configurable'
  # PR 680 melissalinkert 'CellWorx: do not assume that the first well/field file exists'

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

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 261 rleigh-dundee 'Generate PDF using XeLaTeX'
  # PR 368 rleigh-dundee 'Cpp: Correct content and markup'
  # PR 455 bpindelski 'Clean up testing.txt'

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