Merge pull request #1259 from bpindelski/rebased/dev_5_0/fake_channels

Fix wrong number of channels for images in fake SPW (fix #12501) (rebased onto dev_5_0)
merge dev_5_0 -Dorg -Ssuccess-only: PR 1262 (jj2000: Fix compile on Java 8 (dev_5_0))
merge dev_5_0 -Dorg -Ssuccess-only

Repository: openmicroscopy/bioformats
Updating 3d7ad7f..fe874c2
Previously merged:
  # PR 1259 bpindelski 'Fix wrong number of channels for images in fake SPW (fix #12501) (rebased onto dev_5_0)'

Merged PRs:
  # PR 1262 rleigh-dundee 'jj2000: Fix compile on Java 8 (dev_5_0)'

Generated by OME-5.0-merge-push#172 (http://ci.openmicroscopy.org/job/OME-5.0-merge-push/172/)