logging cleanup and fix for a CSI assignment race condition found in bug 122
merge