Merge pull request #2166 from jballanc/rebased/dev_5_0/buffered-reader-oom-fix

Prevent `ServiceHandler` from retaining excess `java.io.BufferedReader` instances (see #12049) (rebased onto dev_5_0)
Merge pull request #2164 from dominikl/rebased/dev_5_0/path_on_import_selection

Bugfix: Image import: File naming settings were ignored (rebased onto dev_5_0)
merge dev_5_0 -D org: PR 2108 (release-src includes bioformats version metadata)
merge dev_5_0 -D org: PR 2158 (assist #11091: refactor server DB queries for hierarchy navigation (rebased))
merge dev_5_0 -D org: PR 2167 (Passes channel configuration to Make_Movie (see #12036))
merge dev_5_0 -D org: PR 2168 (Update dev_5_0 submodules)
merge dev_5_0 -D org

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

Merged PRs:
  # PR 2108 rleigh-dundee 'release-src includes bioformats version metadata'
  # PR 2158 mtbc 'assist #11091: refactor server DB queries for hierarchy navigation (rebased)'
  # PR 2167 cneves 'Passes channel configuration to Make_Movie (see #12036)'
  # PR 2168 snoopycrimecop 'Update dev_5_0 submodules'

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

Merged PRs:
  # PR 915 imunro 'Fix for single channel  meas_mode 13 data.'
  # PR 946 melissalinkert 'Read internal pyramids from CellSens .vsi data'
  # PR 951 ctrueden 'Fix up Bio-Formats POMs'
  # PR 952 melissalinkert 'Memoization fixes'
  # PR 957 melissalinkert 'Correctly set Modulo annotations for multi-Image datasets (rebased onto dev_5_0)'
  # PR 958 melissalinkert 'Flex: be more permissive in parsing IFDs and XML (rebased onto dev_5_0)'
  # PR 960 melissalinkert 'Cache OME-XML between ImagePluses (rebased onto dev_5_0)'
  # PR 968 melissalinkert 'Cellomics: a few fixes for single-file datasets (rebased onto dev_5_0)'
  # PR 972 melissalinkert 'CZI: restrict dimension adjustment'
Conflicting PRs (not included):
  # PR 971 chris-allan 'Scope test dependencies in specification component properly'

Repository: ome/scripts
Updating c0916f6..d9b2af5
Merged PRs (fast-forward):
  # PR 68 will-moore 'Kymograph_Analysis creates single csv. See #11909 (rebased onto dev_5_0)'

Merged PRs:
  # PR 70 cneves 'Allow passing extra channel rendering options to Make_Movie script'

Repository: openmicroscopy/ome-documentation
Updating 85c8eab..ec8c086
Merged PRs (fast-forward):
  # PR 696 hflynn 'Removing contributing & formats docs from dev_5_0'

Merged PRs:
  # PR 698 joshmoore 'Fix Windows paths error found by Javier Colmeiro'

Generated by OMERO-5.0-merge-daily#606 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-daily/606/)