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