DELL OME trap forwarding OME host name not node name

Hi All, I have seen a few post around this issue but can't see a definitive answer. 

When I forward an alert via email, the originating host is correctly mentioned, when i forward via SNMP trap the originating host is the OME server. This means support teams aren't sure which host is reporting an issue. 

I'm on v 2.2.0.x

Issue is same as https://www.dell.com/community/Dell-OpenManage-Essentials/Open-Manage-Essentials-SNMP-Trap-Forwarding-issues-Configuration/td-p/5023984

Example:

2016-08-05T14:41:42-05:00 | OMEServer1.domain.com | snmptd:Redundancy lost  Redundancy unit: System Board PS Redundancy  Chassis location: Main System Chassis  Previous redundancy state was: Normal |

When it should say something Like:

2016-08-05T14:41:42-05:00 | ExchangeServer1.domain.com | snmptd:Redundancy lost  Redundancy unit: System Board PS Redundancy  Chassis location: Main System Chassis  Previous redundancy state was: Normal |

does anyone know the solution ? Is the issue is resolved in 2.5 I can upgrade