Fix catalyst 3xxx inheritance and setModeTrunk

Changes the inheritance of the Catalyst_3xxx so they inherit their capabilities
Fixes the setModeTrunk for the Catalysts 3xxx since they need the trunk encapsulation to be set before being in trunk mode

For review + merge