Fix to Fan TURN_ON and TURN_OFF features required for HA 2025.1 (and fix merge issues)

Fix to Fan TURN_ON and TURN_OFF features required for HA 2025.1 (and fix merge issues) #87