Attachment 30730 of Oracle bugzilla 23234 was landed in b1_8 and master tree and was picked up into Whamcloud git trees.
However, comment#18 of the bugzilla showed the fix was flawed. Attachment 32953 contains the correct fix that worked for us. We thus need to carry a local patch. Please pick up this fix.