Addressed code review comments
Updated tests.
Merge pull request #253 from tapanagupta/ctdbp_no

Reviews Complete. Re-ran all tests. Ready to generate eggs (all 3 drivers).
Merge remote branch 'upstream/master'