Merge "Removed sun.util.resources."