Fix split on "+" for connection strings that specify dialects

Fixes bug 1399486

Change-Id: I3b7e6331751f25d9c4221393e8329934925791e7
Merge "Fix split on "+" for connection strings that specify dialects"