Fix for NMS-6005: Negative filter for services in alarm list shows null

Conflicts:
	features/ncs/ncs-alarm-gui/src/main/webapp/WEB-INF/jsp/alarm/ncs-alarms.jsp
	opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/list.jsp