fixup! MDL-44164 Correct @package statements for plugins
fixup! MDL-44164 Grr collapse