Unfortunately I don't have a build environment for this here at work but I can confirm that by manually applying the change to the query in edbPackage.cpp in the diff to the query I snatched from pg_log, the output looks good. No more duplicates.
// Per