CRM-15197 - Webtest fixes
Merge pull request #4174 from colemanw/CRM-15197

CRM-15197 - Webtest fixes