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