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
Merge branch 'dev' into python3

Conflicts:
	python/phonenumbers/geodata/locale.py
	python/tests/testdata/region_DE.py
	tools/python/makefile
Cope with missing country code in metadata.

This is needed to parse the new ShortNumberMetadata.xml file.
Merge branch 'dev' into python3

Conflicts:
	python/phonenumbers/phonemetadata.py