CBD-924:  better debug output

Change-Id: I3bf58cd1313b2ab2c8b64118a442038689ed9b62