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