1.12.5-SNAPSHOT -> 1.12.5
Fix for NMS-6424 - Exception on node.jsp with storeByForeignSource enabled and no data collection for the node.
Merge remote branch 'origin/1.12' into rc/stable/1.12.5
update docs for extra bugfixes
Fix for NMS-6403 - Security Information disclosed in Service detail screen

Now, for custom monitors like PSM or MTM, if there is an attribute
called password or user-info, its content will be masked with "XXXX".
If there is a parameter where the key attribute contains password or
passwd, the value will be masked with "XXXX".

For standard parameters, if the parameter's key contains the word
password, it won't be displayed.

The solution was verified on a testing environment.
Merge remote branch 'origin/1.12' into rc/stable/1.12.5
add NMS-6403 as well
Fixing drools-engines.log on log4j.properties
Merge branch 'rc/stable/1.12.5' into 1.12
1.12.5 -> 1.12.6-SNAPSHOT
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	container/branding/pom.xml
	container/bridge/pom.xml
	container/features/pom.xml
	container/karaf/pom.xml
	container/pom.xml
	container/servlet/pom.xml
	container/standalone/pom.xml
	container/web/pom.xml
	core/api/pom.xml
	core/build/keystore/pom.xml
	core/build/pom.xml
	core/criteria/pom.xml
	core/daemon/pom.xml
	core/db-install/pom.xml
	core/db/pom.xml
	core/doc/pom.xml
	core/icmp-jna/pom.xml
	core/lib/pom.xml
	core/pom.xml
	core/runtime/pom.xml
	core/schema/pom.xml
	core/snmp/api/pom.xml
	core/snmp/impl-joesnmp/pom.xml
	core/snmp/impl-mock/pom.xml
	core/snmp/impl-snmp4j/pom.xml
	core/snmp/integration-tests/pom.xml
	core/snmp/joesnmp/pom.xml
	core/snmp/pom.xml
	core/soa/pom.xml
	core/tasks/pom.xml
	core/test-api/db/pom.xml
	core/test-api/dns/pom.xml
	core/test-api/http/pom.xml
	core/test-api/lib/pom.xml
	core/test-api/pom.xml
	core/test-api/schema/a/pom.xml
	core/test-api/schema/b/pom.xml
	core/test-api/schema/pom.xml
	core/test-api/services/pom.xml
	core/test-api/snmp/pom.xml
	core/test-api/xml/pom.xml
	core/upgrade/pom.xml
	core/web/pom.xml
	core/xml/pom.xml
	dependencies/activemq-web/pom.xml
	dependencies/activemq/pom.xml
	dependencies/asterisk/pom.xml
	dependencies/castor/pom.xml
	dependencies/dnsjava/pom.xml
	dependencies/drools/pom.xml
	dependencies/felix/pom.xml
	dependencies/gwt/pom.xml
	dependencies/hibernate/pom.xml
	dependencies/jasper/pom.xml
	dependencies/jasypt/pom.xml
	dependencies/javamail/pom.xml
	dependencies/jaxb/pom.xml
	dependencies/jcifs/pom.xml
	dependencies/jdbc-pool/pom.xml
	dependencies/jersey/pom.xml
	dependencies/jfreechart/pom.xml
	dependencies/jinterop/pom.xml
	dependencies/jna/pom.xml
	dependencies/jnlp/pom.xml
	dependencies/jradius/pom.xml
	dependencies/jrobin/pom.xml
	dependencies/jrrd/pom.xml
	dependencies/karaf/pom.xml
	dependencies/liquibase/pom.xml
	dependencies/mina/pom.xml
	dependencies/netty/pom.xml
	dependencies/pax-exam/pom.xml
	dependencies/pom.xml
	dependencies/quartz/pom.xml
	dependencies/rancid/pom.xml
	dependencies/rxtx/pom.xml
	dependencies/servlet/pom.xml
	dependencies/smslib/pom.xml
	dependencies/snmp-test/pom.xml
	dependencies/snmp/pom.xml
	dependencies/snmp4j-agent/pom.xml
	dependencies/snmp4j/pom.xml
	dependencies/spring-security/pom.xml
	dependencies/spring-test/pom.xml
	dependencies/spring-web/pom.xml
	dependencies/spring/pom.xml
	dependencies/tracker/pom.xml
	dependencies/twitter4j/pom.xml
	extensions/pom.xml
	features/access-point-monitor/pom.xml
	features/acl/pom.xml
	features/geocoder/api/pom.xml
	features/geocoder/google/pom.xml
	features/geocoder/nominatim/pom.xml
	features/geocoder/pom.xml
	features/gwt-graph-resource-list/pom.xml
	features/gwt-ksc-add/pom.xml
	features/gwt-ksc-combobox/pom.xml
	features/gwt-snmpselect-list/pom.xml
	features/gwt-suggestion-combobox/pom.xml
	features/gwt-tableresources/pom.xml
	features/instrumentationLogReader/pom.xml
	features/isoc-ipv6-gui/pom.xml
	features/isoc-ipv6-participants/pom.xml
	features/jdbc-collector/pom.xml
	features/juniper-tca-collector/pom.xml
	features/name-cutter/pom.xml
	features/ncs/ncs-alarm-gui/pom.xml
	features/ncs/ncs-drools/pom.xml
	features/ncs/ncs-model/pom.xml
	features/ncs/ncs-northbounder/pom.xml
	features/ncs/ncs-persistence/pom.xml
	features/ncs/ncs-test/pom.xml
	features/ncs/pom.xml
	features/node-page-list/pom.xml
	features/notifications/pom.xml
	features/notifications/sms-strategy/pom.xml
	features/notifications/ticket-strategy/pom.xml
	features/nrtg/api/pom.xml
	features/nrtg/broker/pom.xml
	features/nrtg/commander/pom.xml
	features/nrtg/features/all/pom.xml
	features/nrtg/features/api/pom.xml
	features/nrtg/features/commander/pom.xml
	features/nrtg/features/nrtg-base/pom.xml
	features/nrtg/features/nrtg-jms/pom.xml
	features/nrtg/features/nrtg-local/pom.xml
	features/nrtg/features/pom.xml
	features/nrtg/features/protocolcollector/pom.xml
	features/nrtg/features/protocolcollector/snmp/pom.xml
	features/nrtg/features/protocolcollector/tca/pom.xml
	features/nrtg/features/web/pom.xml
	features/nrtg/jar/nrtcollector/pom.xml
	features/nrtg/jar/pom.xml
	features/nrtg/nrtbroker-jms/pom.xml
	features/nrtg/nrtbroker-local/pom.xml
	features/nrtg/nrtcollector/pom.xml
	features/nrtg/pom.xml
	features/nrtg/protocolcollector/pom.xml
	features/nrtg/protocolcollector/snmp/pom.xml
	features/nrtg/protocolcollector/tca/pom.xml
	features/nrtg/system-exports/pom.xml
	features/nrtg/web/pom.xml
	features/opennms-gwt-theme/pom.xml
	features/opennms-jmx-tools/pom.xml
	features/phonebook/pom.xml
	features/poller/api/pom.xml
	features/poller/pom.xml
	features/poller/runtime/pom.xml
	features/pom.xml
	features/provisioning/api/pom.xml
	features/provisioning/lib/pom.xml
	features/provisioning/pom.xml
	features/remote-poller-gwt/pom.xml
	features/remote-poller-jnlp/pom.xml
	features/remote-poller/pom.xml
	features/reporting/api/pom.xml
	features/reporting/availability/pom.xml
	features/reporting/core/pom.xml
	features/reporting/dao/pom.xml
	features/reporting/jasper-reports/pom.xml
	features/reporting/model/pom.xml
	features/reporting/pom.xml
	features/reporting/repository/pom.xml
	features/reporting/sdo/pom.xml
	features/request-tracker/pom.xml
	features/root-webapp/pom.xml
	features/sms-reflector/bundle-tests/pom.xml
	features/sms-reflector/commands/pom.xml
	features/sms-reflector/dist/pom.xml
	features/sms-reflector/integration/pom.xml
	features/sms-reflector/pom.xml
	features/sms-reflector/poms/compiled/pom.xml
	features/sms-reflector/poms/pom.xml
	features/sms-reflector/poms/wrappers/pom.xml
	features/sms-reflector/provision/pom.xml
	features/sms-reflector/rxtx-commands/pom.xml
	features/sms-reflector/sms-gateway/pom.xml
	features/sms-reflector/sms-monitor/pom.xml
	features/sms-reflector/sms-ping/pom.xml
	features/sms-reflector/sms-service/pom.xml
	features/springframework-security/pom.xml
	features/system-report/pom.xml
	features/themes/onms-default-theme/pom.xml
	features/themes/pom.xml
	features/ticketing/api/pom.xml
	features/ticketing/drools-integration/pom.xml
	features/ticketing/jira-integration/pom.xml
	features/ticketing/otrs-integration/pom.xml
	features/ticketing/pom.xml
	features/ticketing/remedy-integration/pom.xml
	features/ticketing/rt-integration/pom.xml
	features/topology-map/archetypes/archetype-example-operation/src/main/resources/archetype-resources/pom.xml
	features/topology-map/features/api/pom.xml
	features/topology-map/features/dev/pom.xml
	features/topology-map/features/pom.xml
	features/topology-map/features/runtime-base/pom.xml
	features/topology-map/features/runtime-browsers/pom.xml
	features/topology-map/features/runtime-linkd/pom.xml
	features/topology-map/features/runtime-ncs/pom.xml
	features/topology-map/features/runtime-sfree/pom.xml
	features/topology-map/features/runtime-simple/pom.xml
	features/topology-map/features/runtime-vmware/pom.xml
	features/topology-map/features/vaadin/pom.xml
	features/topology-map/org.opennms.features.topology.api/pom.xml
	features/topology-map/org.opennms.features.topology.app/pom.xml
	features/topology-map/org.opennms.features.topology.dump/pom.xml
	features/topology-map/org.opennms.features.topology.helloworld/pom.xml
	features/topology-map/org.opennms.features.topology.shell/pom.xml
	features/topology-map/org.opennms.features.topology.widgetset/pom.xml
	features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/pom.xml
	features/topology-map/plugins/org.opennms.features.topology.plugins.devutils/pom.xml
	features/topology-map/plugins/org.opennms.features.topology.plugins.layout/pom.xml
	features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/pom.xml
	features/topology-map/plugins/org.opennms.features.topology.plugins.netutils/pom.xml
	features/topology-map/plugins/org.opennms.features.topology.plugins.ssh/pom.xml
	features/topology-map/plugins/org.opennms.features.topology.plugins.status/pom.xml
	features/topology-map/plugins/org.opennms.features.topology.plugins.topo.history/pom.xml
	features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/pom.xml
	features/topology-map/plugins/org.opennms.features.topology.plugins.topo.onmsdao/pom.xml
	features/topology-map/plugins/org.opennms.features.topology.plugins.topo.sfree/pom.xml
	features/topology-map/plugins/org.opennms.features.topology.plugins.topo.simple/pom.xml
	features/topology-map/plugins/org.opennms.features.topology.plugins.topo.vmware/pom.xml
	features/topology-map/plugins/pom.xml
	features/topology-map/pom.xml
	features/topology-map/poms/compiled/pom.xml
	features/topology-map/poms/pom.xml
	features/topology-map/poms/wrappers/pom.xml
	features/topology-map/provision/pom.xml
	features/topology-map/themes/default-theme/pom.xml
	features/topology-map/themes/pom.xml
	features/vaadin-node-maps/pom.xml
	features/vaadin-snmp-events-and-metrics/pom.xml
	features/vaadin-topology-widget/pom.xml
	integration-tests/pom.xml
	integrations/opennms-dns-provisioning-adapter/pom.xml
	integrations/opennms-jasper-extensions/pom.xml
	integrations/opennms-link-provisioning-adapter/pom.xml
	integrations/opennms-map-provisioning-adapter/pom.xml
	integrations/opennms-puppet-provisioning-adapter/pom.xml
	integrations/opennms-rancid-provisioning-adapter/pom.xml
	integrations/opennms-reverse-dns-provisioning-adapter/pom.xml
	integrations/opennms-rws/pom.xml
	integrations/opennms-snmp-asset-provisioning-adapter/pom.xml
	integrations/opennms-vmware/pom.xml
	integrations/pom.xml
	opennms-ackd/pom.xml
	opennms-alarms/api/pom.xml
	opennms-alarms/daemon/pom.xml
	opennms-alarms/http-northbounder/pom.xml
	opennms-alarms/jms-northbounder/pom.xml
	opennms-alarms/pom.xml
	opennms-alarms/syslog-northbounder/pom.xml
	opennms-assemblies/http-remoting/pom.xml
	opennms-assemblies/jmx-config-generator-onejar/pom.xml
	opennms-assemblies/mock-snmp-agent-onejar/pom.xml
	opennms-assemblies/pom.xml
	opennms-assemblies/remote-poller-onejar/pom.xml
	opennms-assemblies/remote-poller-standalone/pom.xml
	opennms-assemblies/rxtx-assembly/pom.xml
	opennms-assemblies/system-report-onejar/pom.xml
	opennms-assemblies/version/pom.xml
	opennms-assemblies/webapp-full/pom.xml
	opennms-assemblies/xsds/pom.xml
	opennms-asterisk/pom.xml
	opennms-base-assembly/pom.xml
	opennms-base-assembly/src/main/filtered/etc/log4j.properties
	opennms-bootstrap/pom.xml
	opennms-config-model/pom.xml
	opennms-config-tester/pom.xml
	opennms-config/pom.xml
	opennms-correlation/drools-correlation-engine/pom.xml
	opennms-correlation/opennms-correlator/pom.xml
	opennms-correlation/pom.xml
	opennms-dao/pom.xml
	opennms-doc/pom.xml
	opennms-enterprise-reporting/opennms-reportd/pom.xml
	opennms-enterprise-reporting/pom.xml
	opennms-full-assembly/pom.xml
	opennms-icmp/opennms-icmp-api/pom.xml
	opennms-icmp/opennms-icmp-jna/pom.xml
	opennms-icmp/opennms-icmp-jni/pom.xml
	opennms-icmp/opennms-icmp-jni6/pom.xml
	opennms-icmp/pom.xml
	opennms-import/pom.xml
	opennms-install/pom.xml
	opennms-javamail/opennms-javamail-api/pom.xml
	opennms-javamail/pom.xml
	opennms-jetty/pom.xml
	opennms-model/pom.xml
	opennms-provision/opennms-detector-bsf/pom.xml
	opennms-provision/opennms-detector-datagram/pom.xml
	opennms-provision/opennms-detector-generic/pom.xml
	opennms-provision/opennms-detector-jdbc/pom.xml
	opennms-provision/opennms-detector-jmx/pom.xml
	opennms-provision/opennms-detector-lineoriented/pom.xml
	opennms-provision/opennms-detector-simple/pom.xml
	opennms-provision/opennms-detector-ssh/pom.xml
	opennms-provision/opennms-detector-web/pom.xml
	opennms-provision/opennms-mock-simpleserver/pom.xml
	opennms-provision/opennms-provision-api/pom.xml
	opennms-provision/opennms-provision-persistence/pom.xml
	opennms-provision/opennms-provisiond/pom.xml
	opennms-provision/opennms-snmp-scanners/pom.xml
	opennms-provision/pom.xml
	opennms-reporting/pom.xml
	opennms-rrd/opennms-rrd-api/pom.xml
	opennms-rrd/opennms-rrd-jrobin/pom.xml
	opennms-rrd/opennms-rrd-model/pom.xml
	opennms-rrd/opennms-rrd-rrdtool/opennms-rrdtool-api/pom.xml
	opennms-rrd/opennms-rrd-rrdtool/pom.xml
	opennms-rrd/opennms-rrd-tcp/pom.xml
	opennms-rrd/pom.xml
	opennms-services/pom.xml
	opennms-test/pom.xml
	opennms-tools/centric-troubleticketer/pom.xml
	opennms-tools/cli-pinger/pom.xml
	opennms-tools/connection-tracker/pom.xml
	opennms-tools/csv-requisitions/pom.xml
	opennms-tools/groovy-tools/pom.xml
	opennms-tools/ireport-jrobin-provider/pom.xml
	opennms-tools/jrobin-spike-hunter/pom.xml
	opennms-tools/m2eclipse-integration/org.opennms.m2e.castor.tests/projects/castor/castor-p002/pom.xml
	opennms-tools/m2eclipse-integration/pom.xml
	opennms-tools/mib2events/pom.xml
	opennms-tools/opennms-qosdaemon/pom.xml
	opennms-tools/opennms-rrd-converter/pom.xml
	opennms-tools/opennms-rrd-stresser/pom.xml
	opennms-tools/opennms-tip/cxf-dependencies/pom.xml
	opennms-tools/opennms-tip/openejb-dependencies/pom.xml
	opennms-tools/opennms-tip/opennms-tip-ram/pom.xml
	opennms-tools/opennms-tip/pom.xml
	opennms-tools/opennms-tip/tip-framework-dependencies/pom.xml
	opennms-tools/perfdata-receiver/pom.xml
	opennms-tools/pom.xml
	opennms-tools/quickbase-troubleticketer/pom.xml
	opennms-tools/remedy-troubleticketer/pom.xml
	opennms-tools/scriptd-event-proxy/pom.xml
	opennms-tools/selector-tracker/pom.xml
	opennms-tools/spectrum-event-importer/pom.xml
	opennms-tools/syslog-profiler/pom.xml
	opennms-tools/syslog-profiler/profiler/pom.xml
	opennms-util/pom.xml
	opennms-web-api/pom.xml
	opennms-web-dependencies/pom.xml
	opennms-webapp/pom.xml
	opennms-webapp/src/main/webapp/WEB-INF/jsp/element/service.jsp
	opennms-wmi/pom.xml
	pom.xml
	protocols/cifs/pom.xml
	protocols/dhcp/pom.xml
	protocols/nsclient/pom.xml
	protocols/pom.xml
	protocols/radius/pom.xml
	protocols/selenium-monitor/pom.xml
	protocols/xml/pom.xml
	protocols/xmp/pom.xml
	smoke-test/pom.xml
	tests/mock-elements/pom.xml
	tests/mock-snmp-agent/pom.xml
	tests/pom.xml