Merge pull request #9874 from mikeller/add_test_version_dump