Hopefully this is the end of this longish thread :) I installed the following two patches in master, and installed something similar in maint.
0001-tests-be-robust-to-quote-style.patch
Description: Binary data
0002-tests-remove-quote-magic-from-the-bison-test-wrapper.patch
Description: Binary data
