Merge remote branch 'readonly/1.10' into space-integration-12.3-code-freeze-branch
fix imports
Merge branch 'space-integration-12.3-code-freeze-branch'
bump doc year to 2013 also
1.10.8 documentation updates
Merge branch '1.10' of git+ssh://opennms.git.sourceforge.net/gitroot/opennms/opennms into 1.10
1.10.8-SNAPSHOT -> 1.10.8
1.10.8 -> 1.10.9-SNAPSHOT
Fix for Bug NMS-5710
Fix for Bug NMS-5720
Added HistoryOperation interface so that certain menu operations can
create and apply history to themselves. To start with, I implemented
this interface in a few CheckedOperation classes.
NMS-5730 remove old serviceregistry (mDNS) code
adjust the left margin
add styles; remove print statements
Merge remote-tracking branch 'origin/1.10' into space-integration-12.3-code-freeze-branch

Conflicts:
	core/api/pom.xml
	core/build/keystore/pom.xml
	core/build/pom.xml
	core/criteria/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/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/snmp/pom.xml
	core/test-api/xml/pom.xml
	core/web/pom.xml
	core/xml/pom.xml
	debian/changelog
	dependencies/asterisk/pom.xml
	dependencies/castor/pom.xml
	dependencies/dbpool/pom.xml
	dependencies/dnsjava/pom.xml
	dependencies/drools/pom.xml
	dependencies/gwt/pom.xml
	dependencies/hibernate/pom.xml
	dependencies/jasper/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/jmdns/pom.xml
	dependencies/jna/pom.xml
	dependencies/jnlp/pom.xml
	dependencies/jradius/pom.xml
	dependencies/jrobin/pom.xml
	dependencies/jrrd/pom.xml
	dependencies/liquibase/pom.xml
	dependencies/mina/pom.xml
	dependencies/netty/pom.xml
	dependencies/pom.xml
	dependencies/quartz/pom.xml
	dependencies/rancid/pom.xml
	dependencies/rrd4j/pom.xml
	dependencies/rxtx/pom.xml
	dependencies/servlet/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/acl/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/mdns/pom.xml
	features/node-page-list/pom.xml
	features/notifications/sms-strategy/pom.xml
	features/opennms-gwt-theme/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/ticketing/api/pom.xml
	features/ticketing/pom.xml
	integration-tests/pom.xml
	integrations/opennms-dns-provisioning-adapter/pom.xml
	integrations/opennms-integration-otrs/pom.xml
	integrations/opennms-integration-rt/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/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-assemblies/http-remoting/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/webapp-full/pom.xml
	opennms-assemblies/xsds/pom.xml
	opennms-asterisk/pom.xml
	opennms-base-assembly/pom.xml
	opennms-bootstrap/pom.xml
	opennms-config-tester/pom.xml
	opennms-config-utils/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-jetty/src/main/java/org/opennms/netmgt/jetty/JettyServer.java
	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-qosdaemon/pom.xml
	opennms-reporting/pom.xml
	opennms-rrd/opennms-rrd-api/pom.xml
	opennms-rrd/opennms-rrd-jrobin/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/csv-requisitions/pom.xml
	opennms-tools/groovy-tools/pom.xml
	opennms-tools/ireport-jrobin-provider/pom.xml
	opennms-tools/jira-troubleticketer/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/mib2events/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-util/pom.xml
	opennms-web-api/pom.xml
	opennms-web-dependencies/pom.xml
	opennms-webapp/pom.xml
	opennms-wmi/pom.xml
	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
NMS-5730 remove service registry references from opennms.properties
Refactored HistoryManager slightly so that SavedHistory can save options
from HistoryOperations.
Added a LayoutOperation superclass and implemented the history
operations for the layout selections and all other CheckedOperation
classes.
Added CRC token to SavedHistory. Fixed bugs in the TopologySelector and
HideNodesWithoutLinksOperation operations. Moved onBind/onUnbind
operations for history into the history blueprint to fix bundle
lifecycle problems.
Fix NMS-4858 (Need ability to hand-edit service and category names
in requisition web editor)

Added a boolean session attribute and a control in the requisition
editor view for toggling its value. When true, the names of services
and node categories render as free-form inputs rather than select
controls. It's the best I can do without rewriting the editor :)