CBD-924:  fixup directory management

Change-Id: I7f9c542f4652d234356e2da80e2a7b49a3467282