CBD-924:  fixup directory management

Change-Id: Ic3d9718a5a9b8f7ea003032e87792c9ba60e7e8e