Various fixes needed to resolve issues with loss of template setting in puppet apache.