Merge "BUG-2625: enable JDK8 verfication for next"