fix to not depend on JVM timing
fix a bunch of tests using InetAddress.getByName
Merge branch '1.12'

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/poller/pollables/PendingPollEvent.java
update criteria registration bug
make sure linkd tests use a pristine copy of linkd-configuration.xml
fix indentation
use InetAddressUtils, also handle exceptions more anally
Merge branch '1.12'
Merge branch 'master' into pull-requests