Merge remote-tracking branch 'origin/mq-filter-stack'

diff --cc lib/string.h
Simple merge

diff --cc nest/config.Y
Simple merge

diff --cc nest/proto.c
Simple merge

diff --cc nest/protocol.h
Simple merge

diff --cc proto/bfd/config.Y
Simple merge

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

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

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

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