Comment 2 for bug 1451598

I know this debdiff does not fix all the errors, but it does alleviate some of them. I'd like to get this single backported commit integrated since I'm not sure if I will be able to find time to fix the remaining errors.

For those of you having issue with this, I greatly suggest moving to trusty, as these errors are significantly cleaned up there.