Merge metadata changes from upstream r674
Generated Python files for metadata
Prep for 6.2.0 release