Comment 3 for bug 1374091

I've force-pushed a union variant that returns the expected results, and uses a fast plan. Also included the upgrade script. Thanks for the further testing, Ben.