Merge "API changes for Locale to OpenJDK8u60 (part 1/2)"