Merge "BUG-2625: validate tsdr using jdk8 only"