Add support for Ice 3.5 (develop)

Same as https://github.com/openmicroscopy/openmicroscopy/pull/982, rebased onto develop