Merge "Additional fixes for dpkg lock issues"