Fix of #SPC-480
Fix of alarm page: Clear of Memos did not work anymore
Added ability to perform additional Comparator-based sorting inside the
OnmsDaoContainer so that we can sort on properties that are @Transient
and cannot easily be sorted in the database with Hibernate. Addresses
bug SPC-579.
Merge branch 'master' of git://github.com/OpenNMS/opennms

Conflicts:
	opennms-webapp/src/main/java/org/opennms/web/controller/alarm/AlarmDetailController.java
	opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/detail.jsp