Merge commit 'martins/onnode_options'
drwxr-xr-x - ctdb