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

--Webtest modifications
--Sample data and upgradation fixes