Merge pull request #7096 from s0undt3ch/0.16

0.16
Random part of VM name from build number if available.