CXX-316 Update Connection String URI Parsing