4.5 Webtests fixes
Merge pull request #3998 from monishdeb/45-webtest-fix

4.5 Webtests fixes