Xens_config: fix merge error
Upstream 3.0.99