or, duh, just delete it
bump to latest jetty, also add jetty-deploy dep
auto-scan for webapps
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	pom.xml
1) add annotations, 2) ???, 3) PROFIT!
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	opennms-webapp/src/test/java/org/opennms/web/svclayer/DefaultOutageServiceIntegrationTest.java
make sure smoke-test prereqs are built too
umm... oops?
Merge branch '1.10' into 1.12

Conflicts:
	smoke-test/do-smoke-test.sh
Merge branch '1.12'
SmtpMonitor regex fixes + unit tests.
have to make sure we are in the right dir
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge remote-tracking branch 'origin/1.12'
Fix for Bug NMS-6564

The SFTP Connection are not closed when an exception is thrown using
3GPP XML Collector.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	protocols/xml/src/main/java/org/opennms/protocols/xml/collector/AbstractXmlCollectionHandler.java
	protocols/xml/src/main/java/org/opennms/protocols/xml/collector/Sftp3gppXmlCollectionHandler.java
Fix for Bug NMS-6562

Notifications are truncated at 4000 chars in database.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-config/src/main/java/org/opennms/netmgt/config/NotificationManager.java
make this test more forgiving about timing
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	features/access-point-monitor/src/test/java/org/opennms/netmgt/accesspointmonitor/AccessPointMonitordTest.java