r23954: merge from 3_0-ctdb-tridge: