Merge "Update BGP dev and user guide" into stable/boron