Merge branch 'erp5-component' into erp5
Resilient stack: add support for unique_by_network sla mode.
KVM: convert kvm instance profile to jinja2.
Merge remote-tracking branch 'origin/master' into erp5-component