Fix for NMS-5949 'MAC Address like' search doesn't show non-ip interfaces
Merge branch '1.12' of github.com:OpenNMS/opennms into 1.12
fix some test failures
Merge branch '1.12'
Merge remote-tracking branch 'opennms/master' into dao-refactor