merged from ronnie

(This used to be ctdb commit 57a80110ddfd202f8de37297db76dc43a064e476)

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

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