refactor this test to allow for timeouts
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	core/icmp-jna/src/test/java/org/opennms/jicmp/jna/NativeSocketTest.java