Merge "Fix OpenJDK TCK test after 2017c update"