or, duh, just delete it
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'
Merge branch 'master' into pjsm/2.0