Some fixes to support multi-node ci + Ganeti QA