Merge "VPP: remove naginator retry"