Changes merged directly to knife-xenserver instead of monkeypatching