There still was an old configuration floating around in the component repository POMs that configured for -bundled, and whether this was commented out or not was inconsistent. These commits move these configuration snippets to the parent pom, disables the -bundled config there, and thus really fix #10876.