Comment 16 for bug 1726879

I didn't really want to take anything away from volunteers, but this is a low hanging fruit fix - so I prepped a few MPs to review.

I need to run ppa's for those and add an SRU template still, but I wanted to push these to be seen and ready for review already.