Resolve model references even if annotations are not populated

This should fix #12093.
Merge branch 'bug-fixes' of github.com:melissalinkert/bioformats into bug-fixes
merge develop -D org: PR 857 (Initial support for Zeiss .lms files)
merge develop -D org: PR 858 (Initial support for Veeco AFM data)
merge develop -D org: PR 859 (Assorted metadata/tile parsing fixes)
merge develop -D org: PR 950 (Cellomics: a few fixes for single-file datasets)
merge develop -D org: PR 959 (CZI: make sure that SubBlocks are correctly initialized in openBytes (rebased onto develop))
merge develop -D org: PR 970 (C++: Add FormatReader implementation)
merge develop -D org: PR 973 (C++: Fixes for the OME-XML model and metadata store interfaces)
merge develop -D org: PR 974 (Update logging jars (rebased))
merge develop -D org: PR 975 (cpp: cmake: Don't enable -pedantic if it breaks long long use)
merge develop -D org

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 881 qidane 'New wavelength' (exclude comment)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI' (label: exclude)
Updating c558413..ac30253
Merged PRs (fast-forward):
  # PR 977 hflynn 'Fix links to Zeiss image browser software (rebased onto develop)'

Merged PRs:
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files'
  # PR 858 melissalinkert 'Initial support for Veeco AFM data'
  # PR 859 melissalinkert 'Assorted metadata/tile parsing fixes'
  # PR 950 melissalinkert 'Cellomics: a few fixes for single-file datasets'
  # PR 959 melissalinkert 'CZI: make sure that SubBlocks are correctly initialized in openBytes (rebased onto develop)'
  # PR 970 rleigh-dundee 'C++: Add FormatReader implementation'
  # PR 973 rleigh-dundee 'C++: Fixes for the OME-XML model and metadata store interfaces'
  # PR 974 ximenesuk 'Update logging jars (rebased)'
  # PR 975 rleigh-dundee 'cpp: cmake: Don't enable -pedantic if it breaks long long use'

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