Merge "Adding SNMP4SDN features"