Build fixes

This branch fix some issue building Xapi packages under CentOS 6.4 which do some internal testing for Ocaml libraries.