Cherry picks for `mate-netbook` 1.6

Hi,

These are my suggested cherry picks for the next `mate-netbook` tarball.

Regards, Martin.