[7u6] Request for approval: 7175845 & 7177216 - Regression fixes.

[Abhijit Saha]

We've found following regressions from a fix in 7u5. So we need to fix 
these once we sync 7u5 changes into 7u6.

Bug: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7175845
Bug: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7177216

Webrev:
http://cr.openjdk.java.net/~asaha/7175845_7177216/webrev.0/

Reviewers: Xueming Shen, Alan Bateman


Thanks
Abhijit