Comment 15 for bug 1552778

Thanks Galen! The test now passes for me and the layout on the check out tab is improved. I was also able to confirm that #3 is indeed an issue in master without this code.

I've signed off on the changes and merged them to master for inclusion in 3.2. I'll leave the 3.1 target open in case we want to backport it once it's gotten some production use. Since 3.0 is nearing its end of life, should we set that target to Won't Fix?