[NF] Add ifIndex to SwitchPort when polling via SNMP
Merge