Copy 11194 and well hierarchy 10075 develop

This is in dev_4_4 as https://github.com/openmicroscopy/openmicroscopy/pull/1475, now for develop...