Merge "Adding BNG port mapping for BBSIM"