updated maven-surefire-plugin to the last version
Merge branch 'master' into realthargor/surefire_update
Merge branch 'master' into realthargor/surefire_update
checking for end of input stream to avoid IOException
adding a line for formatting
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
fix buffer not appending correctly from last fix
Merge branch '1.12'

Conflicts:
	core/snmp/api/src/main/java/org/opennms/netmgt/snmp/SnmpAgentConfig.java
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.
Fixed compile errors in Ackd.
Updated WebAlarmRepository so that it depends less on the AlarmFilter
code that is used in the web UI. Changed AbstractDaoHibernate so that it
resets the projections on criteria that are used for counting so that
the criteria can be reused for row-based queries.