Fix import bugs. (see #9860, #9859) (rebased onto develop)



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

----

Fix https://trac.openmicroscopy.org.uk/ome/ticket/9860
 testing information added to the ticket