Please find patch for the issue.
There is a best practice of naming patch that you upload to JIRA Ticket. You should name it with JIRA Ticket ID, so in this case the patch name could be "OFBIZ-7592.patch", and if you provide patches for branches too, it can be OFBIZ-7592-1412.patch OFBIZ-7592-1512.patch.
This has been committed at r#1750242
Thanks Nameet and Yash for your contribution.