Fix parsing of static ndp entries
config: more static ndp fixes
Merge remote-tracking branch 'upstream/master'