Merge "Drivetrain HA node definitions and class mapping changed"