Merge pull request #2030 from knabar/feature-smart-omero-web-config

Load default when appending to/removing from an unset omero.web property
Merge pull request #1712 from rleigh-dundee/release-zip

Create release source artifact containing all submodules
Set the active flag correctly.
merge develop -D org -I include -E exclude: PR 1956 (Login button)
merge develop -D org -I include -E exclude: PR 1960 (Remove cut link 11882)
merge develop -D org -I include -E exclude: PR 1975 (Implemented a hash on BlitzGateway objects)
merge develop -D org -I include -E exclude: PR 2005 (assist #11091: refactor server DB queries for hierarchy navigation)
merge develop -D org -I include -E exclude: PR 2065 (Rnd copy paste develop)
merge develop -D org -I include -E exclude: PR 2067 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 2068 (Admin user develop)
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2036 joshmoore 'DSL Map Type' (exclude comment)
  # PR 1742 aleksandra-tarkowska '11591 user ip' (label: exclude)
  # PR 1385 manics 'Update the OMERO VirtualBox image' (exclude comment)
Already up-to-date.

Merged PRs:
  # PR 1956 jburel 'Login button'
  # PR 1960 will-moore 'Remove cut link 11882'
  # PR 1975 dpwrussell 'Implemented a hash on BlitzGateway objects'
  # PR 2005 mtbc 'assist #11091: refactor server DB queries for hierarchy navigation'
  # PR 2065 jburel 'Rnd copy paste develop'
  # PR 2067 snoopycrimecop 'Update develop submodules'
  # PR 2068 jburel 'Admin user develop'
Conflicting PRs (not included):
  # PR 2051 will-moore 'Login redirects #hash. See #11957'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 881 qidane 'New wavelength' (label: exclude)
  # PR 872 melissalinkert 'UpgradeChecker: fix the stable version number (rebased onto develop)' (status: failure)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files'
  # PR 858 melissalinkert 'Initial support for Veeco AFM data'
  # PR 859 melissalinkert 'Assorted metadata/tile parsing fixes'
  # PR 866 melissalinkert 'Update POMs to point to mirror of the cppwrap plugin (rebased onto develop)'
  # PR 884 rleigh-dundee 'Make a buildable source release'
  # PR 885 melissalinkert 'Correctly set Modulo annotations for multi-Image datasets'
  # PR 886 melissalinkert 'Flex: be more permissive in parsing IFDs and XML'
  # PR 891 melissalinkert 'Fix tiled TIFF reading and writing (rebased onto develop)'

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

Merged PRs:
  # PR 60 will-moore 'Kymograph_Analysis creates single csv. See #11909'

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

Merged PRs:
  # PR 626 pwalczysko 'Add new Squash tutorial and screenshots'
  # PR 645 sbesson 'Add --devel option to install the OMERO 5 via Homebrew (rebased onto develop)'
  # PR 650 sbesson 'Add Matlab jobs to the continuous integration page'

Generated by OMERO-5.1-merge-push#36 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/36/)