[Bug 916424] Tumbleweed: desktop kernel file conflict during recent large update