Merge "Ensure core plugins are bundled by Maven"