[Bug 429324] *-branding-* packages don't conflict