Merge "Add some more tests to those breaking since move to OpenJDK"
am: c4252b1179

* commit 'c4252b1179ee9204384e9ca1ac8d5524691316a5':
  Add some more tests to those breaking since move to OpenJDK