Merge "Make ClassPathURLStreamHandlerTest deal with symlinks"