Fix omode handling in dev/srv; have csquery always open #s/cs until we are sure binding works

Signed-off-by: Ronald G. Minnich <rminnich@google.com>