Merge "Fix containerd installation"