Merge commit 'martins/status-test-2'

Conflicts:

	server/eventscript.c

diff --cc include/ctdb_private.h
Simple merge

diff --cc server/ctdb_control.c
Simple merge

diff --cc server/ctdb_takeover.c
Simple merge

diff --cc server/eventscript.c
Simple merge