Merge change I6d8a640c

* changes:
  Make java.util.Formatter perform acceptably (and fix two jtreg failures).