RFR: Backports of 7115383, 8009152

[Gary Collins]

RFR: Backports of 7115383, 8009152

These changes have been in 8 for a few months now. Just a simple backport of said changes to 7. 
The original request was for said changes to go into 7. This is the final task to make that happen.

8009152: A number of jtreg tests need review/improvement
7115383: TEST_BUG: some jtreg tests fail because they explicitly specify -server option

Combined webrev 
http://cr.openjdk.java.net/~collins/7115383-8009152-open/webrev/
Original 8: 
http://cr.openjdk.java.net/~collins/7115383/webrev.00/
http://cr.openjdk.java.net/~collins/8009152/webrev-01/

Thanks
Gary