bgpd: merge osr/quagga-osr-patches (BZ#700)

this merges a bgp capability negotiation fix where bgpd would fail if no
multiprotocol capability was present, but other capabilities were.