merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/bioformats

Conflicting PRs (not included):
  # PR 359 ctrueden 'License updates (dev_4_4) + obsolete code removal'

Generated by OMERO-merge-stable#139 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-stable/139/)