--HR-347 Rearrange the job tree and webtest fixes
Merge pull request #720 from NileemaJadhav/HR-14-fixes

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