Merge branch 'int-new' into nexthop-merged

diff --cc configure.in
Simple merge

diff --cc doc/bird.sgml
Simple merge

diff --cc filter/filter.c
Simple merge

diff --cc nest/route.h
Simple merge

diff --cc proto/bgp/attrs.c
Simple merge

diff --cc proto/bgp/packets.c
Simple merge

diff --cc proto/ospf/rt.c
Simple merge

diff --cc proto/ospf/rt.h
Simple merge

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

diff --cc sysdep/linux/netlink.c
Simple merge