-- webtest-fix related to issue CRM-12397 and fix for other failing tests
Merge pull request #750 from ravishnair/webtest-fix

-- webtest-fix related to issue CRM-12397 and fix for other failing tests