Merge "BUG-2383 : BGPPeer now sends routes to AdjRibWriter"