merge from tridge

(This used to be ctdb commit 8648104f8d76d22427c14422b126f7e979cc2d95)

diff --cc ctdb/common/ctdb_control.c
Simple merge

diff --cc ctdb/include/ctdb_private.h
Simple merge

diff --cc ctdb/tools/ctdb_control.c
Simple merge