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'
add nicer exception handling
Update link tooltip service name
allow for deselection of ncs service
potential fix for NMS-5922
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'
SPC-643, SPC-644 update colors and keep service links
add styles for new colors
Merge branch 'master' of git://github.com/OpenNMS/opennms