mate-utils: changes from Jessie/Sid + multiple fixes