Adding locale matching util class.  Clean up of iCloud util class.