merge from tridge

(This used to be ctdb commit 9c4e5569b82d9c7894e3ac1d5f0783c4d770daf4)

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

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

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