Issue #3126940 by Beakerboy, daffie: New DB URI breaks if an existing query part is missing the new module parameter (cherry picked from commit d6f9e2c4)