CRM-12463 (BAO cleanup)
CRM-12463
Merge pull request #609 from yashodha/NEW-CHANGES

CRM-12463 (BAO cleanup)