Made connection string literal private.

Also reverted to previous change to resolve merge conflict.