make it easier to debug JSP issues, keep intermediate compiled JSP source in target
make sure favicon is referenced properly regardless of base href
make the smoke tests do timing better for the alarm summary page
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'
fix NPE in alarm details page for events with no nodeId
Changed node type and label source into enums. Added Hibernate and JAXB
mapping classes so that the enums are serialized and deserialized from
the database and XML properly.
Fix for SPC-682

Fixing all the classes that were extending the new CustomField of Vaadin
7.
Updating the JavaDocs for all the classes of the project
vaadin-snmp-events-and-metrics.
Added assembly for packaging the remote poller as a ZIP file along with
some helpful utilities for running on Windows.
re add tooltips, fix SPC-681
fix marquee tool, SPC-683
make bamboo go greeeeeeen!
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	opennms-provision/opennms-provisiond/src/test/java/org/opennms/netmgt/provision/service/InvalidRequisitionDataTest.java
Merge remote-tracking branch 'opennms/1.12'

Conflicts:
	opennms-provision/opennms-provisiond/src/test/java/org/opennms/netmgt/provision/service/InvalidRequisitionDataTest.java
Added missing package to custom.properties - Fix for NMS-6000
Merge branch 'master' of github.com:OpenNMS/opennms
Updated titles and pathnames for Wallboard feature
fix classloader access to the mx4j logger