add a markdown doc
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	README.build
	README.md
NMS-6030 fix cache/race condition in saving user data
Merge remote-tracking branch 'origin/1.12'
make sure /usr/local/bin is in the path
no more daemon directory
handle no more daemon directory in ILR jsp page also.
NMS-6034 add Cisco 3550-12T to linkd config
Fix for SPC-482
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/config/EventAdminApplication.java
Merge remote-tracking branch 'origin/1.10' into rc/stable/1.12.0
Release Notes for Release 1.12.0
Merge remote-tracking branch 'origin/1.10' into 1.12
1.11.95-SNAPSHOT -> 1.12.0
Fix for SPC-665

Now, the event will be saved in the proper folder. Also, if there is no
events on defined, the file will be saved but the reference to the file
won't be added to eventconf.xml. If exist, it will be removed.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/config/EventAdminApplication.java
	features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/events/EventPanel.java
	features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/events/EventWindow.java
	features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/mibcompiler/MibCompilerPanel.java
Fix for TT2295: including also bridge 0 port
Merge branch 'master' of github.com:OpenNMS/opennms
add debian changelog entry
Merge branch 'rc/stable/1.12.0' into 1.12