Fix regression: the directories with desktop files were not watched anymore, so users had to run kbuildsycoca4 by hand after installing new desktop files. Fixes bug 182472. See SVN commit 918838.

Fix duplicated applications in the K menu and in keditfiletype, because kded was creating kservices with absolute paths and not letting local ones override global ones. Fixes bugs 179946, 179462, 182060 and 184716. See SVN commit 921138.