ameliorate #10181: wrap doWork with retry outside transaction
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 1430 (fix #10564: include wells in plate run processing)
merge dev_4_4 -D org -I include -E exclude: PR 1450 (Update log jars)
merge dev_4_4 -D org -I include -E exclude: PR 1459 (Scripts menu 11434)
merge dev_4_4 -D org -I include -E exclude: PR 1460 (Moving omeroweb unittests to pytest)
merge dev_4_4 -D org -I include -E exclude: PR 1478 (Session uuid fixes)
merge dev_4_4 -D org -I include -E exclude: PR 1479 (Enforce 1.0 encoding for scripts/shares (See #11322))
merge dev_4_4 -D org -I include -E exclude: PR 1486 (Add ways to remove 0-byte pyramid files)
merge dev_4_4 -D org -I include -E exclude: PR 1488 (Update dev_4_4 submodules)
merge dev_4_4 -D org -I include -E exclude: PR 1499 (Fix intermittent omero.LockTimeout-s in OmeroJava tests (see #11455))
merge dev_4_4 -D org -I include -E exclude: PR 1500 (10618 priv thumbs)
merge dev_4_4 -D org -I include -E exclude: PR 1528 (Wrap event log upsert SQL in try/catch (see 10181))
merge dev_4_4 -D org -I include -E exclude: PR 1530 (Fix ROI resizing in Insight (see #11384))
merge dev_4_4 -D org -I include -E exclude: PR 1532 (Unwrap namespace)
merge dev_4_4 -D org -I include -E exclude: PR 1533 (Blitz integration tests)
merge dev_4_4 -D org -I include -E exclude: PR 1534 (Dmrefresh)
merge dev_4_4 -D org -I include -E exclude: PR 1537 (fix #11465: add validation checks for admin service)
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 1430 mtbc 'fix #10564: include wells in plate run processing'
  # PR 1450 ximenesuk 'Update log jars'
  # PR 1459 will-moore 'Scripts menu 11434'
  # PR 1460 cneves 'Moving omeroweb unittests to pytest'
  # PR 1478 joshmoore 'Session uuid fixes'
  # PR 1479 joshmoore 'Enforce 1.0 encoding for scripts/shares (See #11322)'
  # PR 1486 melissalinkert 'Add ways to remove 0-byte pyramid files'
  # PR 1488 snoopycrimecop 'Update dev_4_4 submodules'
  # PR 1499 bpindelski 'Fix intermittent omero.LockTimeout-s in OmeroJava tests (see #11455)'
  # PR 1500 joshmoore '10618 priv thumbs'
  # PR 1528 mtbc 'Wrap event log upsert SQL in try/catch (see 10181)'
  # PR 1530 bpindelski 'Fix ROI resizing in Insight (see #11384)'
  # PR 1532 joshmoore 'Unwrap namespace'
  # PR 1533 joshmoore 'Blitz integration tests'
  # PR 1534 jburel 'Dmrefresh'
  # PR 1537 mtbc 'fix #11465: add validation checks for admin service'

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

Merged PRs:
  # PR 673 melissalinkert 'Make configuration file suffix configurable'

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

Merged PRs:
  # PR 41 sbesson 'Activate Travis build and fix scripts to comply with flake8 standards'

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

Merged PRs:
  # PR 480 will-moore 'Script sample gh 470'

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