Make ubus optional
ndp: Enable ping6 keep-alive
Merge remote branch 'upstream/master'