Fix PR #842: "CONN-1164: Updated Direct Config namespace references"

This reverts commit d899bc2c4c55a1e6ae8ccf7e394f01c3340f1abd.

Only non-blank namespaces have been modified by this PR.