fix watchfile for desktop-file-utils. import, adopt, and upgrade 0.20 -> 0.21
clean up desktop-file-utils