fix to not depend on JVM timing
Merge branch '1.12'

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/poller/pollables/PendingPollEvent.java