fix timing of snmp4j trap test
Merge branch 'master' into pull-requests