refactor this test to allow for timeouts

Conflicts:
	core/icmp-jna/src/test/java/org/opennms/jicmp/jna/NativeSocketTest.java
Merge branch 'space/13.2' into mvr/juniper-event-alarm-filters