Comment 14 for bug 1378829

Tested the patch with a fresh master, a system upgraded to rel 2.12 from rel 2.10, and an version of master prior to the fix. In all cases, the pg tap tests succeeded and the problem was resolved.

Committed the fix to master, rel_2_12, and rel_2_11.

Thanks, Jeff!