merge async recovery changes from Ronnie
drwxr-xr-x - ctdb