Merge branch 'erp5' into erp5-z2.13

stack/erp5/buildout.cfg

@@ -198,7 +198,7 @@ extra-context =
 [template-tidstorage]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
-md5sum = 0a065f567df537651bfd459b35c6a575
+md5sum = 5572d10b343bd2de90deeaf55dd0fdc7
 mode = 640
 
 [template-cloudooo]

stack/erp5/instance-tidstorage.cfg.in

@@ -473,7 +473,7 @@ maxconn = {{ backend_configuration['maxconn'] }}
 server-check-path = /{{ site_id }}/getId
 wrapper-path = ${directory:services}/haproxy-{{ backend_name }}
 binary-path = {{ parameter_dict['haproxy'] }}/sbin/haproxy
-ctl-path = ${directory:services}/haproxy-{{ backend_name }}-ctl
+ctl-path = ${directory:bin}/haproxy-{{ backend_name }}-ctl
 backend-list = {{ haproxy_backend_list | join(' ')}}
 {%-  endif %}
 {% endfor -%}