Fix for Bug NMS-4056
NMS-5750 fix null dpname in event header
a little cleanup of things I ran into while working on NMS-5750
NMS-5750 fix null dpname in event header
Merge remote-tracking branch 'origin/1.10' into rc/unstable/1.11.90
Merge remote-tracking branch 'origin/rc/unstable/1.11.90' into 1.12
added sample configuration for jvm-datacollection to examples
Merge branch '1.12' of ssh://opennms.git.sourceforge.net/gitroot/opennms/opennms into 1.12
jvm-datacollection example - fixed new line problem for example graphs
added sample configuration for jvm-datacollection to examples
jvm-datacollection example - fixed new line problem for example graphs
Merge branch 'rc/unstable/1.11.90' into 1.12
Upss! I forgot to remove something related with the old geolocation link.
Simple improvements to syslog northbound interface
  http://issues.opennms.org/browse/NMS-5798

- Support dereferencing paramters from the alarm
- Support conditionally forwarding only first occurrence of an alarm
Merge branch 'rc/unstable/1.11.90' into 1.12
refactor the geolocation asset into separate latitude/longitude in the DB
Merge branch 'rc/unstable/1.11.90' into 1.12

Conflicts:
	opennms-webapp/src/main/webapp/element/node.jsp
added tests for new example configs to WillItUnmarshalTest
Merge branch '1.12' of ssh://opennms.git.sourceforge.net/gitroot/opennms/opennms into 1.12
added tests for new example configs to WillItUnmarshalTest