Merge branch 'rte-update' into mpls-new

diff --cc nest/protocol.h
Simple merge

diff --cc nest/route.h
Simple merge

diff --cc proto/static/static.c
Simple merge

diff --cc sysdep/unix/krt.c
Simple merge