Updated new location mappings to all new vocabs in MSM4J