Fixing provisioning breakage when merging tip of hg