Intermediate template cleanup
Intermediate template cleanup

Case ZC-917: Intermediate cleanup just for the purposes of my own
clarity.  This is apart of a great set of changes.

CpanelInc/ea-apache2-config,CpanelInc/ea-apache2-config