Patch for auto-acknowledgement of threshold events

The current implementation of auto acknowledgements matches an event against
nodeid, serviceid and interfaceid. This is not sufficient for threshold
acknoledgements. The submitted patch allows to set more parameters.
The patch is against 1.2.5.
I am not completely happy with the resulting sql query - LIKE %blah% is ugly,
but I had no idea how to do it better.
Please note that this patch includes also patches #1380 and #1160.
The definition in notifd-configuration.xml look like:
<auto-acknowledge resolution-prefix="RESOLVED: "
uei="uei.opennms.org/threshold/highThresholdRearmed"
acknowledge="uei.opennms.org/threshold/highThresho
ldExceeded">
<match>nodeid</match>
<match>interfaceid</match>
<match>serviceid</match>
<match>ds</match>
</auto-acknowledge>
<auto-acknowledge resolution-prefix="RESOLVED: "
uei="uei.opennms.org/threshold/lowThresholdRearmed"
acknowledge="uei.opennms.org/threshold/lowThreshold
Exceeded">
<match>nodeid</match>
<match>interfaceid</match>
<match>serviceid</match>
<match>ds</match>
</auto-acknowledge>