more fixes for CRM-13212
Merge pull request #1521 from yashodha/4.4.CRM-13212

more fixes for CRM-13212