Use client class option-def for same class option-data

Fortunately not rely on new classification stuff. The idea is from a discussion in #3500 (closed) where client class definition of option 43 is not applied so sub-options are ignored because of a not matching encapsulation space.

@fdupont pointed out this affects RT 23961.