[containerd/1.7] cherry-picks#158

crazy-max merged 26 commits into

docker:containerd/1.7docker/packaging:containerd/1.7from

crazy-max:containerd-1.7_cherry-pickscrazy-max/docker-packaging:containerd-1.7_cherry-picksCopy head branch name to clipboard