Merge pull request #760 from jsmith2/4.3_integration

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