Merge "Return missed salt master class in drivetrain_ha"