Merge "API changes for updating Locale to OpenJDK8u60, part 2"