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
Revert "Revert "CZI: restrict dimension adjustment""

This reverts commit f6ebfd82805ed6175a1ed693da1a9e3c10cd6c91.
Merge pull request #1018 from melissalinkert/flex-naming

Flex: fix support for new file naming scheme