CRM-15227  fix e-notices re undeclared variables