Merge commit 'd9d25760' into eclair * commit 'd9d25760': Remove dead locks in system process when installing packages