CONN-1256 Update for direct namespaces
Merge pull request #855 from jsmith2/CONN-1256
CONN-1202: Resolved merge conflicts from namespace change