Merge pull request #11964 from mshabunin:avi-container-fixes
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 17 Jul 2018 15:35:07 +0000 (15:35 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 17 Jul 2018 15:35:07 +0000 (15:35 +0000)

Trivial merge