bad merge fixes
Merge pull request #2606 from kurund/CRM-14311

bad merge fixes