Merge "Bump containerd version" into release/2019.2.0