--Sample data and upgradation fixes
--Webtest fixes
Merge pull request #713 from NileemaJadhav/HR-14-fixes

Hr 14 fixes