Merge branch 'ctdb-merge' into dmapi-integration