Migrated more plugins to the new v4.0 plugin template
Merge pull request #3199 from pjackson28/moveadditionalpluginstonewtemplate

Migrated more plugins to the new v4.0 plugin template