[Rev 01] RFR: 304: Squash additional commits into merge commits for merge PRs

[Robin Westberg]

> Hi all,
> 
> Please review this change that squashes additional commits made on top of the first merge commit, to allow updating the
> PR.
> Best regards,
> Robin

Robin Westberg has updated the pull request incrementally with two additional commits since the last revision:

 - Fix failing tests
 - Update error message

-------------

Changes:
  - all: https://git.openjdk.java.net/skara/pull/519/files
  - new: https://git.openjdk.java.net/skara/pull/519/files/2499c3a8..978e08f7

Webrevs:
 - full: https://webrevs.openjdk.java.net/skara/519/webrev.01
 - incr: https://webrevs.openjdk.java.net/skara/519/webrev.00-01

  Stats: 7 lines in 2 files changed: 0 ins; 5 del; 2 mod
  Patch: https://git.openjdk.java.net/skara/pull/519.diff
  Fetch: git fetch https://git.openjdk.java.net/skara pull/519/head:pull/519

PR: https://git.openjdk.java.net/skara/pull/519