Merge pull request #715 from NileemaJadhav/HR-379

--HR-379 Job import required field fixes
--HR-394 Fix for navigation error on roles screen
--Funding templates minor changes
Merge pull request #716 from NileemaJadhav/HR-14-fixes

--HR-394 Fix for navigation error on roles screen
--HR-394 Total pay modification on pay screen
Merge pull request #717 from NileemaJadhav/HR-14-fixes

--HR-394 Total pay modification on pay screen
--HR-394 Tweaks for roles screen bug
Merge pull request #718 from NileemaJadhav/HR-14-fixes

--HR-394 Tweaks for roles screen bug
--Webtest fixes
Merge pull request #719 from NileemaJadhav/HR-14-fixes

--Webtest fixes
--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
--Estimator for annual pay fix and Webtest fixes
Merge pull request #721 from NileemaJadhav/HR-14-fixes

--Estimator for annual pay fix and Webtest fixes
--Modification to import fields for Job
--Modifications for import contact fields improvement
--tweaks
--Tweaks
--Field label changes
--Fixes