merge develop -D none -I breaking -E exclude: PR 2893 (fix #970, #12317: adjust dbpatch table; delete map values with triggers)
merge develop -D none -I breaking -E exclude

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2895 dominikl 'Reload groups after users added/removed' (user: dominikl)
  # PR 2883 will-moore 'Revert plugin breakage 12476 (rebased onto develop)' (user: will-moore)
  # PR 2885 will-moore 'Search rc1 fixes develop' (user: will-moore)
  # PR 2412 qidane 'Extra annotations' (label: exclude)
  # PR 2875 sbesson 'Matlab CZI job (rebased onto develop)' (user: sbesson)
  # PR 2884 mtbc 'fix #10766: add API method for changing original files' hasher' (user: mtbc)
  # PR 2182 joshmoore 'Read only flag' (user: joshmoore)
  # PR 2435 rleigh-dundee 'cpp: RTypesI: use static locals in place of duplicated globals' (user: rleigh-dundee)
  # PR 2835 simleo 'Update OmeroPy/src/path.py' (user: simleo)
  # PR 2896 ximenesuk 'Make hql output more consistent' (user: ximenesuk)
  # PR 2799 joshmoore 'Auto close (rebased onto develop)' (user: joshmoore)
  # PR 2870 mtbc 'Remove useless image acquisition times' (user: mtbc)
  # PR 2861 will-moore 'Search improvements 2 (rebased onto develop)' (user: will-moore)
  # PR 2892 ximenesuk 'Fix failing acquisition date search test' (user: ximenesuk)
  # PR 2894 sbesson 'Properties parsing 5.0.3-rc1 fixes (rebased onto develop)' (user: sbesson)
  # PR 2809 snoopycrimecop 'Update develop submodules' (user: snoopycrimecop)
  # PR 2803 joshmoore 'Add `upload_rm` file transfer option (rebased onto develop)' (user: joshmoore)
  # PR 2363 dominikl 'Java Gateway API' (label: exclude)
  # PR 2797 rleigh-dundee 'OmeroCpp: switch build system from SCons to CMake' (user: rleigh-dundee)
  # PR 2795 joshmoore 'Use mklink under Windows (rebased onto develop)' (user: joshmoore)
  # PR 2585 aleksandra-tarkowska 'making time_zone and first_day_of_week configurable' (exclude comment)
Already up-to-date.

Merged PRs:
  # PR 2893 mtbc 'fix #970, #12317: adjust dbpatch table; delete map values with triggers'
Conflicting PRs (not included):
  # PR 2403 aleksandra-tarkowska 'Send email'

Generated by OME-5.1-breaking-push#66 (http://ci.openmicroscopy.org/job/OME-5.1-breaking-push/66/)