Removed an errant ipdb import from commit 9777442
Negligible formatting fixes in query_utils.py
Converted a list comprehension into a generator expression in query_utils.py
Fixed #20321 -- Added missing key name in MergeDict KeyError message

Thanks mark.harviston et gmail.com for the report.