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
switch to logback for smoke tests for proper control over logging
Merge remote-tracking branch 'origin/1.12'
Merge branch 'master' into pjsm/2.0