Fixing some CRL tests with JDK 8
Recording .gitmergeinfo Changes