CRM-12490 - notice fixes
Merge pull request #696 from deepak-srivastava/mastro

CRM-12490 - notice fixes