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