Merge pull request #11964 from mshabunin:avi-container-fixes