-- fixed upgrade script for CRM-12155
Merge pull request #247 from pradpnayak/CRM-12192

--fixed filtering for CRM-12192
Merge pull request #248 from pradpnayak/CRM-12155

-- fixed upgrade script for CRM-12155
--fixed CRM test, for CRM-12192