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 dev_5_0 -D org: PR 1146 (bfsave: metadata improvements)
merge dev_5_0 -D org: PR 1167 (Nikon .nd2 fixes, part 2)
merge dev_5_0 -D org

Repository: openmicroscopy/bioformats
Updating 623cd6d..34ca6fc
Merged PRs (fast-forward):
  # PR 1153 melissalinkert 'CZI: prevent AIOOB exception when populating position metadata'
  # PR 1159 melissalinkert 'First round of Nikon ND2 fixes'
  # PR 1160 joshmoore 'Make private class in DV reader public (see #12358) (rebased onto dev_5_0)'
  # PR 1139 imunro 'Fix for BH .Sdt meas mode 0 & 1 single pixel files & (unrelated) problem with dividing by increment count.'
  # PR 1150 melissalinkert 'Allow dist-matlab to run on Windows (rebased onto dev_5_0)'
  # PR 1157 hflynn 'Removing dead link from Minolta-MRW format page'
  # PR 1144 hflynn 'Updating Zeiss links'
  # PR 1151 hflynn 'Comstat2 link'
  # PR 1134 sbesson 'Add prefix to zip file produced by dist-bftools target'
  # PR 1140 hflynn 'Add 'show and edit on Github' to docs side menu'
  # PR 1143 joshmoore 'Memoizer errs'

Merged PRs:
  # PR 1146 sbesson 'bfsave: metadata improvements'
  # PR 1167 melissalinkert 'Nikon .nd2 fixes, part 2'

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