Merge pull request #13683 from crosbymichael/nat-test-fixes

Fix nat integration tests