Merge branch 'ctdb-merge' into v3-2-test