Fix socket path in UWSGI
Updated the API names for HAProxy
Merge pull request #971 from Zentyal/ejhernandez/ha-fixes-initial-scenario

Fix socket path in HA UWSGI
Fixed a missing declaration
Migrated old redis keys
Revert "Fixed a missing declaration"

This reverts commit 7c24a20a225bf80b07b6d027c699b9a61129bee3.
Revert "Revert "Fixed a missing declaration""

This reverts commit 0e07c1abd5e2f2a8337c862d297caeb10b962d32.
Revert "Migrated old redis keys"

This reverts commit 0cfc9c9cf61a0057fab2446d991ce57e08fad193.
Reverted to use old id schema to prevent already used keys problems
fix version depend
Fixed typo with the API rename
Merge pull request #973 from Zentyal/cperello/haproxy-api-improvements

Cperello/haproxy api improvements
remove empty script and fix permissions of initial-setup
add missing depend
fixed remaining paths referring to /opt/samba4
fixed remaining paths referring to /opt/samba4

Conflicts:
	main/openchange/stubs/apache-rpcproxy.mas
Merge branch 'master' into rpcproxy

Conflicts:
	main/openchange/stubs/apache-rpcproxy.mas