Updates to SNMP sync code for Bugs #1001