r22422: merged tdb changes from ctdb