Merge "Allow path to KVM to be overridden by environment." into idea133