Update export_database script to use prodiver.name
Merge branch 'release-v8.4'