Comment 22 for bug 1320782

Ah, I see you applied everything in the opposite order to that listed - that makes things much easier! I've applied everything and thrown it at CI (should be pre-merge build 86), let's see what happens.

One thing if you're applying other people's commits: please remember to always add a Signed-off-by: - it's important for legal reasons. git cherry-pick and am both have a "--signoff" option for this.