CONN-1273 Namespace fix ported to 4.3
Merge pull request #863 from jsmith2/CONN-1274