Changes to ensure pmtMarker is read correctly whatever the length of string read. (See   trac.openmicroscopy.org.uk/ome/ticket/12035 )
An attempt to add FLIM z-stack support.
Fix reading of 5D Imspector data

This fixes various offset issuse when reading files that have multiple
timepoints, Z sections, and channels.

Fixes #12035.
merge dev_5_0 -D org: PR 1018 (Flex: fix support for new file naming scheme)
merge dev_5_0 -D org: PR 1061 (Fix 5D Imspector support)
merge dev_5_0 -D org

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1062 melissalinkert 'DICOM: expand sequence reading to include known sequences' (status: pending)
  # PR 1016 ctrueden 'Use pom-scijava as parent' (label: exclude)
Updating d69c368..91fff0a
Merged PRs (fast-forward):
  # PR 998 melissalinkert 'Micromanager fixes'
  # PR 1059 rleigh-dundee 'source-archive: Close in use files before removing them (rebased)'

Merged PRs:
  # PR 1018 melissalinkert 'Flex: fix support for new file naming scheme'
  # PR 1061 melissalinkert 'Fix 5D Imspector support'

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