fix missing adj neigh state and SNPA address not present in ui
Merge branch 'space/14.1' of github.com:OpenNMS/opennms into space/14.1
Merge branch 'space/14.1' of git://github.com/OpenNMS/opennms into space-14.1
Merge branch 'space-14.1' of github.com:JunosSpace/opennms into space-14.1