speed up GWT compiles by collapsing properties

Conflicts:
	features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/gwt/TopologyAppWidgetSet.gwt.xml
	features/topology-map/org.opennms.features.topology.widgetset/src/main/java/org/opennms/features/topology/widgetset/gwt/TopologyWidgetset.gwt.xml
	features/topology-map/plugins/org.opennms.features.topology.plugins.ssh/src/main/java/org/opennms/features/topology/ssh/internal/gwt/TerminalWidgetSet.gwt.xml
	features/vaadin-dashboard/src/main/java/org/opennms/features/vaadin/dashboard/DashboardWidgetSet.gwt.xml
	features/vaadin-node-maps/src/main/java/org/opennms/features/vaadin/nodemaps/internal/gwt/NodeMapsWidgetset.gwt.xml
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	features/gwt-snmpselect-list/src/main/java/org/opennms/features/gwt/snmpselect/list/SnmpSelectList.gwt.xml
	features/gwt-tableresources/src/main/java/org/opennms/features/gwt/tableresources/OnmsTableResources.gwt.xml
	features/opennms-gwt-theme/src/main/java/org/opennms/features/gwt/theme/OpennmsTheme.gwt.xml
	features/opennms-gwt-theme/src/main/java/org/opennms/features/gwt/theme/OpennmsThemeRTL.gwt.xml
	features/topology-map/org.opennms.features.topology.app/src/main/java/org/opennms/features/topology/app/internal/gwt/TopologyAppWidgetSet.gwt.xml
	features/topology-map/org.opennms.features.topology.widgetset/src/main/java/org/opennms/features/topology/widgetset/gwt/TopologyWidgetset.gwt.xml
	features/topology-map/plugins/org.opennms.features.topology.plugins.sandbox/widgets/GWTTerminal/src/org/opennms/gwtterminal/GWTTerminal.gwt.xml
	features/topology-map/plugins/org.opennms.features.topology.plugins.sandbox/widgets/GWTTerminal/war/WEB-INF/classes/org/opennms/gwtterminal/GWTTerminal.gwt.xml
	features/topology-map/plugins/org.opennms.features.topology.plugins.ssh/src/main/java/org/opennms/features/topology/ssh/internal/gwt/TerminalWidgetSet.gwt.xml
	features/vaadin-topology-widget/src/main/java/org/opennms/features/vaadin/topology/gwt/TopologyWidget.gwt.xml
	opennms-webapp/src/main/java/org/opennms/dashboard/Dashboard.gwt.xml
	opennms-webapp/src/main/java/org/opennms/gwt/web/ui/CoreWeb.gwt.xml
make timeouts longer, change to non-routable IPs
Merge branch '1.12' of github.com:OpenNMS/opennms into 1.12
Merge remote-tracking branch 'origin/1.12'
fix osgi version
Merge remote-tracking branch 'origin/master' into pjsm/2.0