more merges for GPLv3 update
drwxr-xr-x - ctdb