Fix client code coverage data lost during 2.0 self-test
Merge branch 'master' into geezer