merge from tridge

(This used to be ctdb commit 6c8b90cedc67daa89d54db5268fde18bfc20abaf)

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

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

diff --cc ctdb/tests/ctdb_test.c
Simple merge

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