more BAO work(CRM-12463)
CRM-12463
CRM-12463
Merge pull request #602 from yashodha/CRM-12463

more BAO work(CRM-12463)