backpatch BaseDataSource

Make sure stringtype is added into the url, fix the case of tcpKeepAlive, backpatch changes to make sure null values are not added