[Bug 496850] Broken handling of branched packages when committing