Issue #3424509 by godotislate, quietone, sorlov, smustgrave, alexpott,...
Issue #3424509 by godotislate, quietone, sorlov, smustgrave, alexpott, benjifisher: Update MigratePluginManager to include both attribute and annotation class
(cherry picked from commit 7dd6b190)