Put in correct SNMP root now.
Merge branch 'test' into dev