Merge pull request #480 from dajohnso/tweak_vm_fleece

fix possible infinite loop
remove unneeded parm using wait_for call