Fixed merge compile error.
Changed MockSnmpAgent to use /dev/urandom (if available) as the
entropy gathering device so that MockSnmpAgent tests don't timeout if there
is insufficient entropy to generate seeds to start up the SNMPv3 security protocols.
Changed some Thread.sleep() calls to use while() loops instead so that
the timing is more reliable in PollerTest.
new nodepage outage-timeline feature NMS-6578
Merge remote-tracking branch 'origin/master' into feature-snmp4j2-upgrade

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