ND2: only adjust for {Frame,Time}{Before,After} if LoopSize is used

Fixes #11997.
ND2: do not skip bytes at the end of text info blocks

Fixes #11873.
Merge pull request #1175 from melissalinkert/rgb-export

Fix channel count when exporting RGB images in ImageJ
Merge pull request #1170 from rleigh-dundee/macosx-rpath-cmake3

cmake: Enable CMP0042 @rpath usage for MacOSX
merge develop -D org: PR 983 (Woolz: make sure the service is initialized when calling openBytes (rebased onto develop))
merge develop -D org: PR 1123 (Add a reader that accepts a file containing a file pattern)
merge develop -D org: PR 1154 (Leica: prevent exception when linking EmissionFilter)
merge develop -D org: PR 1164 (Add modulo support for LI-FLIM data)
merge develop -D org: PR 1176 (xsd-fu: Use package namespaces throughout and consolidate commands)
merge develop -D org: PR 1178 (Nikon .nd2 fixes, part 2 (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1162 melissalinkert 'AFI: populate magnification and physical pixel size metadata' (status: failure)
  # PR 978 berl 'Add writing of .v3draw format for easy loading with Vaa3D.' (user: berl)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
  # PR 1161 sommerc 'Initial CellH5 Reader class' (user: sommerc)
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files' (label: exclude)
  # PR 1136 melissalinkert 'Add initial support for reading BinaryOnly OME-TIFF datasets (rebased onto develop)' (label: exclude)
  # PR 858 melissalinkert 'Initial support for Veeco AFM data' (label: exclude)
  # PR 1177 rleigh-dundee 'specification: Add metadata for HDF5 embedding' (exclude comment)
  # PR 1054 qidane 'Additional annotation points throughout the model' (exclude comment)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 1141 LeeKamentsky 'Reader for Amaris FlowSight .cif format' (label: exclude)
Updating f27f679..f67397e
Merged PRs (fast-forward):
  # PR 1170 rleigh-dundee 'cmake: Enable CMP0042 @rpath usage for MacOSX'
  # PR 1175 melissalinkert 'Fix channel count when exporting RGB images in ImageJ'

Merged PRs:
  # PR 983 melissalinkert 'Woolz: make sure the service is initialized when calling openBytes (rebased onto develop)'
  # PR 1123 melissalinkert 'Add a reader that accepts a file containing a file pattern'
  # PR 1154 melissalinkert 'Leica: prevent exception when linking EmissionFilter'
  # PR 1164 melissalinkert 'Add modulo support for LI-FLIM data'
  # PR 1176 rleigh-dundee 'xsd-fu: Use package namespaces throughout and consolidate commands'
  # PR 1178 melissalinkert 'Nikon .nd2 fixes, part 2 (rebased onto develop)'

Generated by OMERO-5.1-merge-push#302 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/302/)