As Eli suggested, I have uploaded a new patch to the jira. Merging new trunk changes and testing them took several hours! It passes all the tests except two unit test failure. These failures do not happen on my machine - if this is a real failure we will address them after merging the patch to the trunk.
Please review the patch and post your comments on jira. Regards, Suresh