10788 4.4.9 update

Changes as requested by @sbesson under http://trac.openmicroscopy.org.uk/ome/ticket/10788#comment:4

/cc @hflynn

----
Not ready for review.