uh, maybe I should just not be allowed to merge code today :)
logger changed too
get rid of extra debug
Merge branch '1.12'

Conflicts:
	core/snmp/api/src/main/java/org/opennms/netmgt/snmp/SnmpAgentConfig.java
Got rid of AckService and moved its methods into the AcknowledgmentDao.