Fixed bundling on vmware.
Fixes for: EUCA-9334