Merge remote-tracking branch 'origin/test-daemons-spare' into test-da…

…emons-spare

# Conflicts:
#	alignak/daemons/arbiterdaemon.py
#	alignak/dispatcher.py
#	alignak/objects/config.py
#	test/test_launch_daemons_spare.py