Merge pull request #5516 from monishdeb/4.6Webtests