Merged a lot of lint fixes from the mrlambeth-master branch.
NMS-6587 forgot that an empty field is legitimate
Merge branch 'master' of github.com:OpenNMS/opennms
fix NMS-6588 path outage problems for IPv6
[bamboo] Automated branch merge (from master:b5436bf431b1c497632db627ea08eff3344da507)