jdk

24f958e8 - More removal of conditional code