Comment 3 for bug 983800

I think it would be really helpful to get this and other small and unobtrusive patches to the test modules like these backported.

We're following stable/essex right now in our CI setup. I think we're not the only ones doing this. There is an incentive to get our fixes upstream so we don't have to maintain them ourselves. If we had to create a separate repository based on stable/essex to contain the backports we need from master, that incentive would go away.