As this bug is highly Debian/Ubuntu-specific I don't think it should be in upstream but in the Debian/Ubuntu patch set
As this bug is highly Debian/ Ubuntu- specific I don't think it should be in upstream but in the Debian/Ubuntu patch set