or, duh, just delete it
make sure smoke-test prereqs are built too
Merge remote-tracking branch 'origin/1.12'
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'