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

Conflicts:
	core/snmp/api/src/main/java/org/opennms/netmgt/snmp/SnmpAgentConfig.java
make a note about doing pull requests from master by default
Merge branch '1.12'
Merge pull request #7 from nallagsoc/master

Checking for end of input stream to prevent IOException