Merge pull request #7573 from rohankatkar/webtests-fixes-master