Marshal country codes using the 2-letters code instead than the 3-letters ones (SIS-153),
and consolidation of the way we handle language codes.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1550973 13f79535-47bb-0310-9956-ffa450edef68