Merge branch 'erp5-component' into erp5
for jio, use latest slapos.cookbook and stop using a development one
Pin newer versions of eggs for zabbix.
Improve README for zabbix.
Remove duplicate lines.
version up : Varnish 3.0.4, including CVE-2013-4090.
version up : HAProxy 1.4.24, including CVE-2013-2175.
Merge remote-tracking branch 'master' into erp5-component