Merge "Make java 8 run-tests runnable on the RI again."