Merge metadata changes from upstream r645
Update copyright date in generated files
Generated Python files for metadata

Includes some changes missed in previous regenerations