fix test failures
jrt fs directory names should not have trailing '/'
Merge from 'jdk'
Merge from 'langtools'