Merge "Fixed bug in vbrg vpp snat patch"