Merge branch 'bpf-sockmap-test-fixes'