Merge pull request #6551 from nabinhait/hotfix

Set warranty claim resolution date as today only if it is not set