(TMP) C++ commit for "Insight units followup"

This is an "add-on" PR to https://github.com/openmicroscopy/openmicroscopy/pull/3240 so that hopefully C++ will go green in the morning. @dominikl : if you could cherry-pick the last commit, I'll close this.