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
Merge branch '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
Merge branch '1.12'
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
Merge branch 'rc/unstable/1.11.90' into 1.12
Merge branch '1.12'
fix lon/lat in create.sql for tests
Merge branch 'rc/unstable/1.11.90' into 1.12
Merge branch '1.12'
Merge branch 'master' into features/linkd-scalability
Improving the example implementation for scriptd-configuration.xml
A minor improvement on the new sample config for Scriptd.
a few more asset longitude/latitude fixes
Merge remote-tracking branch 'origin/1.10' into rc/unstable/1.11.90