Comment 17 for bug 1628889

Oops, I had already applied a previous kernel-messages commit which is why the commit at the top of your branch would not apply. I've now cherry-picked from the v4.10-rc6 version and pushed to unstable (which will soon become Zesty 17.04).