Merge remote branch 'martins/ctdb_control_oom'