Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found""