Cherry picks for `mate-system-tools` 1.6

Hi,

Here are my suggested cherry picks for the next `mate-system-tools` 1.6 tarball.

Regards, Martin.