remove and replace removed template plugin usage in core. refs #1301
Merge pull request #1302 from craigh/pluginfixes

remove and replace removed template plugin usage in core. refs #1301