Account for change in behavior of JDK 1.7 from 1.6.
Merge TFS Changeset 955