CRM-14091, CRM-14092 - Defensive programming
CRM-14091, CRM-14092 - restrictAccess - Avoid unnecessary writes
Remove unused template
Merge pull request #2485 from totten/4.4-security-cleanup

CRM-14091, CRM-14092 - More caution
Merge pull request #2488 from colemanw/4.4

Remove unnecessary tpl