Merge pull request #719 from NileemaJadhav/HR-14-fixes

--Webtest fixes
--HR-347 Rearrange the job tree and webtest fixes