wait for the surveillance view to finish loading
Fixing a typo error on SystemDefPanel
fix permissions on assemblies
<file> does not get directoryMode
Clean up POMs, make sure we're using ECJ for JSPs.
skip this test in 1.12, it flaps, and is fixed in master
SPC-674 fix race condition in requisitions
handle exception clicking log out, also change to an element check
move this back to org.opennms.netmgt.collectd for config-compatibility reasons, since we have not finished the OSGi move anyways
NMS-6011 make alarm reduction/clear keys text rather than varchar(256)
Resolved merge conflict and took over the changes from origin/1.12
regarding changing the database schema for alarms with reduction-
and clearkeys.

Merge branch 'origin-1.12' into bonnier-1.12

Conflicts:
	core/schema/src/main/liquibase/1.11.95/changelog.xml