merge develop -D none -I breaking -E exclude

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2624 aleksandra-tarkowska 'nginx config template improvement' (user: aleksandra-tarkowska)
  # PR 2742 sbesson 'Add strict=True when invoking each line in bin/omero load (rebased onto develop)' (user: sbesson)
  # PR 2722 jburel 'Preview size (rebased onto develop)' (user: jburel)
  # PR 2731 sbesson 'Remove test subcommand from CLI web plugin' (user: sbesson)
  # PR 2182 joshmoore 'Read only flag' (user: joshmoore)
  # PR 2560 will-moore 'for-loop fix removes 'undefined' from reset dialog. See #12301' (user: will-moore)
  # PR 2725 jburel 'Roi analyser (rebased onto develop)' (user: jburel)
  # PR 2391 jburel 'Imagej omero (rebased onto develop)' (user: jburel)
  # PR 2585 aleksandra-tarkowska 'making time_zone and first_day_of_week configurable' (exclude comment)
  # PR 2747 dominikl 'Bugfix: Saved by display' (user: dominikl)
  # PR 2127 dpwrussell 'Working view to email announcements to selected users, groups, email addresses and/or all users' (user: dpwrussell)
  # PR 2739 sbesson 'CLI fs plugin: integration tests and bug fixes (rebased onto develop)' (user: sbesson)
  # PR 2729 joshmoore 'DB: Annotation link insert triggers for search (rebased onto develop)' (status: pending)
  # PR 2686 aleksandra-tarkowska 'clear sessions' (user: aleksandra-tarkowska)
  # PR 2612 chris-allan 'Add wsgi.py for OMERO.web (develop)' (user: chris-allan)
  # PR 2550 dominikl 'Avoid upscaling of bird's eye image' (user: dominikl)
  # PR 2363 dominikl 'Java Gateway API' (label: exclude)
  # PR 2691 jburel 'Tag import (rebased onto develop)' (user: jburel)
  # PR 2435 rleigh-dundee 'cpp: RTypesI: use static locals in place of duplicated globals' (user: rleigh-dundee)
  # PR 2412 qidane 'Extra annotations' (label: exclude)
Already up-to-date.

Conflicting PRs (not included):
  # PR 2403 aleksandra-tarkowska 'Send email'
Generated by OMERO-5.1-breaking-push#59 (http://ci.openmicroscopy.org/job/OMERO-5.1-breaking-push/59/)