CRM-15296 enotice fix
Merge pull request #4267 from eileenmcnaughton/CRM-15296-e-notice

CRM-15296 enotice fix