Revert "[release/0.11] Cherry-pick testing fixes from v0.10.0-rc.9 and update containerd version used "#1911

kiashok merged 1 commit intorelease/0.11microsoft/hcsshim:release/0.11from

revert-1881-updateCtrdTagmicrosoft/hcsshim:revert-1881-updateCtrdTagCopy head branch name to clipboard