FL-1211: Merge app-emulation/vmware-modules from vmware overlay