Merge "BUG-2625: enable JDK8 verification for tsdr"