BZ-1098065: create per version directories and unzip vanilla in there
Merge pull request #6288 from kabir/mixed-domain

BZ-1098065: create per version directories and unzip vanilla in there