TRUNK-4406: Remove duplicate keys from message resource files