Don't write vm.properties by default, since only jenkins needs it
Merge branch 'provider-script-leaves-no-trace'

Ninja merge on a weekend to get jenkins working (woo!)