Ctdbp no

Fixes for JIRA issues CISWMI-271 and CIDEVMI-1482.