Merge pull request #1471 from jburel/mock-sample

mock object
Merge pull request #1458 from sbesson/javadocs_warnings

Fix Javadocs warnings
merge develop -Dorg -Ssuccess-only: PR 1407 (TIFF: fix plane count calculation for pyramids with multiple planes)
merge develop -Dorg -Ssuccess-only: PR 1442 (Update roi handler)
merge develop -Dorg -Ssuccess-only: PR 1461 (Changed ND2 metadata string handling to work properly with empty strings)
merge develop -Dorg -Ssuccess-only: PR 1477 (Flex: improved metadata handling)
merge develop -Dorg -Ssuccess-only: PR 1478 (C++: Add helpers for XML serialisation)
merge develop -Dorg -Ssuccess-only

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1479 qidane 'Updated XSLT for units conversion' (exclude comment)
  # PR 1177 rleigh-dundee 'specification: Add metadata for HDF5 embedding' (exclude comment)
  # PR 858 melissalinkert 'Initial support for Veeco AFM data' (label: exclude)
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files' (label: exclude)
  # PR 1381 melissalinkert 'Parse physical pixel sizes from CellSens .vsi datasets' (label: exclude)
  # PR 1309 melissalinkert 'Allow tile-based access of large JPEG-2000 images' (exclude comment)
  # PR 1161 sommerc 'Initial CellH5 Reader class' (user: sommerc)
  # PR 1480 melissalinkert 'Imspector OBF: support version 5 stacks' (status: failure)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 1426 qidane 'Initial Rendering Definitions schema' (exclude comment)
  # PR 1443 joshmoore 'Genshi ZIP' (label: exclude)
Updating a0565c9..cfb6648
Previously merged:
  # PR 1458 sbesson 'Fix Javadocs warnings'
  # PR 1471 jburel 'mock object'
  # PR 1473 rleigh-dundee 'C++: Minor documentation and whitespace fixes'
  # PR 1472 rleigh-dundee 'cpp: compat: Add boolean type'
  # PR 1474 sbesson 'Add bash script for updating copyright headers (rebased onto dev_5_0) (rebased onto develop)'
  # PR 1476 sbesson 'Improve failure message and description of dist target'

Merged PRs:
  # PR 1407 melissalinkert 'TIFF: fix plane count calculation for pyramids with multiple planes'
  # PR 1442 bramalingam 'Update roi handler'
  # PR 1461 csachs 'Changed ND2 metadata string handling to work properly with empty strings'
  # PR 1477 melissalinkert 'Flex: improved metadata handling'
  # PR 1478 rleigh-dundee 'C++: Add helpers for XML serialisation'

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