cmdliner-devel should be ocaml-cmdliner-devel

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
Resync ocaml-vhd with xenserver/buildroot

Signed-off-by: David Scott <dave.scott@eu.citrix.com>