Snmp traps sent by RHEV-M are in incorrect order

Issue

After upgrading from 3.4.2-0.2.el6ev to 3.4.3-1.2.el6ev the rhev manager sends snmp traps but seems like the trap order gets changed and due to this the HP openview/Network Manager rejects the traps.

Currently it is like
v2pdu.add(new VariableBinding(SnmpConstants.snmpTrapOID, trapOID));
+ v2pdu.add(new VariableBinding(SnmpConstants.sysUpTime,
+ new TimeTicks((System.nanoTime() - nanoStart) / 10000000)));

needs to be like
+ v2pdu.add(new VariableBinding(SnmpConstants.sysUpTime,
+ new TimeTicks((System.nanoTime() - nanoStart) / 10000000)));
v2pdu.add(new VariableBinding(SnmpConstants.snmpTrapOID, trapOID));