Resync cmdliner, ocaml-vhd with xenserver/buildroot