Flex: fix whitespace annoyances
Flex: fix the case where one field is stored in each file

See #11382 and
http://lists.openmicroscopy.org.uk/pipermail/ome-devel/2014-March/002721.html
Revert "CZI: restrict dimension adjustment"

This reverts commit f8ce7b1e749fe7d85d7fac1d2d547861166d3d43.
Flex: one more fix for dimension adjustment

The extra check for a valid image count is not necessary if only one
file is present in the dataset.
Merge remote-tracking branch 'origin/dev_5_0' into flex-naming
Flex: correct channel indexing when there is not one name per plane
Changes to ensure pmtMarker is read correctly whatever the length of string read. (See   trac.openmicroscopy.org.uk/ome/ticket/12035 )
Micromanager: do not allow Position to query reader state in openBytes

This prevents potential exceptions when openBytes is called on a
memoized file.
merge dev_5_0 -D org: PR 998 (Micromanager fixes)
merge dev_5_0 -D org: PR 1018 (Flex: fix support for new file naming scheme)
merge dev_5_0 -D org: PR 1024 (DICOM: fix file grouping so that path names are normalized)
merge dev_5_0 -D org: PR 1033 (Add the series index to the default image name)
merge dev_5_0 -D org: PR 1040 (Only add a MetadataOnly element if no TiffData elements are present (rebased onto dev_5_0))
merge dev_5_0 -D org: PR 1045 (Changes to ensure pmtMarker is read correctly.)
merge dev_5_0 -D org

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1016 ctrueden 'Use pom-scijava as parent' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 998 melissalinkert 'Micromanager fixes'
  # PR 1018 melissalinkert 'Flex: fix support for new file naming scheme'
  # PR 1024 melissalinkert 'DICOM: fix file grouping so that path names are normalized'
  # PR 1033 melissalinkert 'Add the series index to the default image name'
  # PR 1040 melissalinkert 'Only add a MetadataOnly element if no TiffData elements are present (rebased onto dev_5_0)'
  # PR 1045 imunro 'Changes to ensure pmtMarker is read correctly.'

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