Merge pull request #3 from makinacorpus/stable

beecollab fixes
Merge commit 'ccd19fdcc27f89ae1c2241d0a7a90ffe34651c66'
circus fixes & completion
etherpad + circus
Merge remote-tracking branch 'origin/stable' into stable

Conflicts:
	files/etc/circus/circusd.conf.d/010_global.ini
	files/etc/circus/circusd.conf.d/watcher.ini
	files/etc/init.d/circusd
	services/collab/etherpad-standalone.sls
	services/monitoring/circus-standalone.sls