Interleaved fixes dev_4_4

This is the same as https://github.com/openmicroscopy/bioformats/pull/396 but rebased onto dev_4_4