Adding sublocality_name_type and locality_name_type handling, and updated the messages as necessary, along with the data.
Fixing some label definitions to not have _label
Fixing compile errors in Java.