worked on CRM-12011
-- webtest fixes and improvement
Merge pull request #36 from kurund/CRM-12011

worked on CRM-12011
Merge pull request #37 from ravishnair/webtest-fixes

-- webtest fixes and improvement