Merge metadata updates from upstream r579
Generated Python files for metadata
Merge code changes from upstream r579
Prep for 5.6 release
Merge metadata updates from upstream r585
Generated Python files for metadata
Update java.version in locale data
Rename *MetaData* to *Metadata* (step 1/2)
Rename *MetaData* to *Metadata* (step 2/2)
Update text for MetaData -> Metadata
Add ShortNumberMetadata.xml from upstream r589
Cope with missing country code in metadata.

This is needed to parse the new ShortNumberMetadata.xml file.
Found another MetaData -> Metadata change
Merge metadata updates from upstream r590 and r593
Generated Python files for metadata
Add short_code and standard_rate to PhoneMetadata
Generated Python files for new metadata format
Merge code changes from upstream r594
PEP8 warning fixes
Register short metadata with PhoneMetadata