[Bug 225681] Merge Review: desktop-file-utils