Merge pull request #14570 from matthewd/uri_deprecation_warning

Avoid a spurious deprecation warning for database URLs