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

Hr 14 fixes
--Label changes
--fix
Merge pull request #725 from NileemaJadhav/HR-379

--Label changes
--Handle upgrade and install/uninstall bugs