Reviewed-by: jjg, shurailine
The test for JDK-7118412 was dropped from the changeset in a merging accident. Reviewed-by: jjg