proper null-checks in toString
fix typo
Merge branch '1.12'

Conflicts:
	core/snmp/api/src/main/java/org/opennms/netmgt/snmp/SnmpAgentConfig.java