* fix nxos_bgp_af issues * shippable fix * review comments * shippable error fix (cherry picked from commit 75a34f6668)
75a34f6668