Merge leftovers of 0e1a86bc845 in 3-0-ctdb