Open Manage Essentials SNMP Trap Forwarding issues/Configuration

Hello all,

I'm attempting to forward the OME servers traps to our monitoring server.  It does this correctly, however the issue I am experiencing is that it forwards it with the OME servers name instead of the originating server.  This does not make it easy to track down which one the alert was generated for.  My team keeps assuming the OME server has failed drives and shrugs it off as false positives!  I have tried sending both the trap in original format and not, with no luck.  I'm using OME 2.2.  Opened a support case with Dell and didn't get any luck... getting a bit desperate. 

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 |