merge from tridge

(This used to be ctdb commit 02cda01c032804cb1c53593ceb98685c827e2d58)

diff --cc ctdb/server/ctdb_recoverd.c
Simple merge