In the end ripping out the monkey patching was okay as there's a newer escaping function in bzrlib.xml8 anyway.
In the end ripping out the monkey patching was okay as there's a newer escaping function in bzrlib.xml8 anyway.