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