Merge "Configure honeycomb NAT settings after vpp crash"