Backport OFBIZ-11317

[Jacques Le Roux]

Hi All,

Even if OFBIZ-11306 does not directly depend upon it, it's safer to have been 
backported with it.

If nobody disagree, I'll do so in a week

Thanks

Jacques