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
skip juniper examples
intern string in InetAddressUtils v4, plus some empty string cleanup in the xml adapter
additional checks for making sure we have null rather than 127.0.0.1
Merge branch '1.12'
Fixing XML Tests because of CollectionAgent.getStorageDir()
Renaming AbcstractXmlCollectorTest to AbstractXmlCollectorTest
Renaming AbcstractXmlCollectorTest to AbstractXmlCollectorTest