Merge changes Ibdee4976,I63d44745,Id471a4d1,I101e428a

* changes:
  Matcher: Adopt behavior changes forgotten in update to OpenJDK 8.
  Matcher: Reduce diff vs. upstream OpenJDK 8u121-b13 (refactor part 4).
  Matcher: Reduce diff vs. upstream OpenJDK 8u121-b13 (refactor part 3).
  Matcher: Reduce diff vs. upstream OpenJDK 8u121-b13 (refactor part 2).