Hi. Please take a look on the changes in: http://cr.openjdk.java.net/~shurailine/8157339/webrev.00/
I have gone through the code to discover potential instabilities. I was not changing the test logic much and mostly changed the code where I had to change it for stabilization reason. In some cases it was easier to move logic into methods to avoid copy-pasting it around. The other bits of work which I was able to identify (TODOs), do not affect test stability, as far as I can see. I am CCing Praveen Mohan and Alexander Kouznetsov who had worked on that code before. Shura.
