Merge pull request #1977 from dmbaturin/bgp-op-mode
T4771: further improvements to the BGP op mode script