Language switch update for data.xml and servlet-context.xml