I have to take over this fix.The latest webrev from the review thread above (with a few minor changes) is here:
http://cr.openjdk.java.net/~igerasim/8071571/00/webrev/
Would you please review/approve the fix at your convenience? Sincerely yours, Ivan
