Migrated additional plugins to the new v4.0 plugin template.
Merge pull request #3205 from pjackson28/movemorepluginstonewv40template

Migrated additional plugins to the new v4.0 plugin template.