Micromanager fixes (rebased onto develop)



This is the same as gh-998 but rebased onto develop.

----

This should fix https://trac.openmicroscopy.org.uk/ome/ticket/11972 and the problems from Eric reported by @ximenesuk.

See datasets in QA 7885 and data_repo/from_skyking/micromanager/eric.