Squashed commit of the following:

commit 2a1dc17c07bd41f95526ed54695d15b29933ad38
Merge: 7842761 9710a15
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Fri May 23 13:27:23 2014 -0400

    Merge branch '1.12' of github.com:OpenNMS/opennms into mynms-3044

commit 7842761e02bab9a99bb01d47630e26bba27ed7b8
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Fri May 23 13:25:07 2014 -0400

    Fix an XSS vulnerability involving node labels

commit 44a447a9b7af69b96d60dccbdb5a476fc0bc2716
Merge: 728ee89 e3a4c44
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Thu May 22 09:56:43 2014 -0400

    Merge branch '1.12' of github.com:OpenNMS/opennms into mynms-3044

commit 728ee893a960831adb787958c94854e6cba3bfbf
Merge: 2e658c3 8975d39
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed May 21 18:56:22 2014 -0400

    Merge branch '1.12' of github.com:OpenNMS/opennms into mynms-3044

commit 2e658c39653897b11c1e03308b430ae758a313ce
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Tue May 20 18:59:55 2014 -0400

    Fix a reflected XSS vulnerability in the alarm details page
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-model/src/main/java/org/opennms/netmgt/model/events/EventUtils.java
	opennms-services/src/main/java/org/opennms/netmgt/eventd/EventUtil.java
	opennms-web-api/src/main/java/org/opennms/web/servlet/XssRequestWrapper.java
	opennms-webapp/src/main/java/org/opennms/web/controller/alarm/AlarmDetailController.java
	opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/detail.jsp