Resynchronise barrier code with xcp-idl/master